OTUS
/
GoLang_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Все починил.

master
Andrey Ivanov 2020-11-08 15:02:00 +03:00 committed by tiburon
parent 9892ee6dd5
commit 8777f33c6e
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -31,6 +31,7 @@ jobs:
script:
- make lint
- make unit-test
- make integration-test
- make build
- make docker-build
if: (type = push) OR (type = pull_request)

3
cmd/main.go
View File

@ -5,6 +5,7 @@ import (
"log"
"os"
"os/signal"
"syscall"
"github.com/tiburon-777/OTUS_Project/internal/application"
"github.com/tiburon-777/OTUS_Project/internal/config"
@ -27,7 +28,7 @@ func main() {
}
go func() {
signals := make(chan os.Signal, 1)
signal.Notify(signals)
signal.Notify(signals, syscall.SIGINT, syscall.SIGKILL, syscall.SIGTERM)
<-signals
signal.Stop(signals)

3
cmd/main_test.go
View File

@ -29,8 +29,8 @@ func TestIntegrationPositive(t *testing.T) {
main()
}(ctx)
//time.Sleep(30*time.Second)
// Реализовать тесты логики приложения (ресайзы по разным требованиям):
time.Sleep(3*time.Second)
wg.Add(3)
t.Run("test static", func(t *testing.T) {
defer wg.Done()
@ -75,6 +75,7 @@ func TestIntegrationNegative(t *testing.T) {
}(ctx)
// Реализовать тесты отказа:
time.Sleep(3*time.Second)
wg.Add(5)
t.Run("remote server not exist", func(t *testing.T) {
defer wg.Done()

2
previewer.conf
View File

@ -10,6 +10,6 @@ StoragePath = "./assets/cache"
Timeout = 15
[Log]
File = "previewer.log"
File = "./previewer.log"
Level = "INFO"
MuteStdout = false

10
project_test.html
View File

@ -3,19 +3,19 @@
</head>
<body>
<div>
<img src="http://localhost/200/400/tiburon.su/img/portfolio/big/011.jpg">
<img src="http://localhost:8080/200/400/tiburon.su/img/portfolio/big/011.jpg">
</div>
<div>
<img src="http://localhost/fill/200/400/tiburon.su/img/portfolio/big/011.jpg">
<img src="http://localhost:8080/fill/200/400/tiburon.su/img/portfolio/big/011.jpg">
</div>
<div>
<img src="http://localhost/fill/400/200/tiburon.su/img/portfolio/big/011.jpg">
<img src="http://localhost:8080/fill/400/200/tiburon.su/img/portfolio/big/011.jpg">
</div>
<div>
<img src="http://localhost/fill/1200/1400/tiburon.su/img/portfolio/big/011.jpg">
<img src="http://localhost:8080/fill/1200/1400/tiburon.su/img/portfolio/big/011.jpg">
</div>
<div>
<img src="http://localhost/fill/400/400/tiburon.su/img/portfolio/big/011.jpg">
<img src="http://localhost:8080/fill/400/400/tiburon.su/img/portfolio/big/011.jpg">
</div>
</body>
</html>