Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2024-12-30 22:34:13 -05:00
Code Issues Activity

fix: replace time.sleep() with checking logs (#899)

Browse source 
Signed-off-by: Lisca Ana-Roberta <ana.kagome@yahoo.com>
This commit is contained in:
Lisca Ana-Roberta 2022-10-21 21:17:06 +03:00 committed by GitHub
parent 00e65bd32b
commit 26d982becb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 139 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
pkg/cli/cve_cmd_test.go
View file

@ -7,6 +7,7 @@ import (
"bytes"
"context"
"fmt"
"io"
"os"
"path"
"regexp"
@ -369,7 +370,18 @@ func TestServerCVEResponseGQL(t *testing.T) {
Search: searchConfig,
}
logFile, err := os.CreateTemp(t.TempDir(), "zot-log*.txt")
if err != nil {
panic(err)
}
logPath := logFile.Name()
defer os.Remove(logPath)
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
go func(controller *api.Controller) {
// this blocks
@ -386,7 +398,11 @@ func TestServerCVEResponseGQL(t *testing.T) {
time.Sleep(100 * time.Millisecond)
}
time.Sleep(90 * time.Second)
_, err = test.ReadLogFileAndSearchString(logPath, "DB update completed, next update scheduled", 90*time.Second)
if err != nil {
panic(err)
}
defer func(controller *api.Controller) {
ctx := context.Background()
@ -641,7 +657,18 @@ func TestNegativeServerResponse(t *testing.T) {
Search: searchConfig,
}
logFile, err := os.CreateTemp(t.TempDir(), "zot-log*.txt")
if err != nil {
panic(err)
}
logPath := logFile.Name()
defer os.Remove(logPath)
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
go func(controller *api.Controller) {
// this blocks
@ -658,7 +685,10 @@ func TestNegativeServerResponse(t *testing.T) {
time.Sleep(100 * time.Millisecond)
}
time.Sleep(90 * time.Second)
_, err = test.ReadLogFileAndSearchString(logPath, "CVE config not provided, skipping CVE update", 90*time.Second)
if err != nil {
panic(err)
}
defer func(controller *api.Controller) {
ctx := context.Background()
@ -714,7 +744,18 @@ func TestNegativeServerResponse(t *testing.T) {
Search: searchConfig,
}
logFile, err := os.CreateTemp(t.TempDir(), "zot-log*.txt")
if err != nil {
panic(err)
}
logPath := logFile.Name()
defer os.Remove(logPath)
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
go func(controller *api.Controller) {
// this blocks
@ -731,7 +772,10 @@ func TestNegativeServerResponse(t *testing.T) {
time.Sleep(100 * time.Millisecond)
}
time.Sleep(90 * time.Second)
_, err = test.ReadLogFileAndSearchString(logPath, "DB update completed, next update scheduled", 90*time.Second)
if err != nil {
panic(err)
}
defer func(controller *api.Controller) {
ctx := context.Background()
@ -778,7 +822,18 @@ func TestServerCVEResponse(t *testing.T) {
Search: searchConfig,
}
logFile, err := os.CreateTemp(t.TempDir(), "zot-log*.txt")
if err != nil {
panic(err)
}
logPath := logFile.Name()
defer os.Remove(logPath)
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
go func(controller *api.Controller) {
// this blocks
@ -795,7 +850,11 @@ func TestServerCVEResponse(t *testing.T) {
time.Sleep(100 * time.Millisecond)
}
time.Sleep(90 * time.Second)
_, err = test.ReadLogFileAndSearchString(logPath, "DB update completed, next update scheduled", 90*time.Second)
if err != nil {
panic(err)
}
defer func(controller *api.Controller) {
ctx := context.Background()

18
pkg/cli/image_cmd_test.go
View file

@ -8,6 +8,7 @@ import (
"context"
"encoding/json"
"fmt"
"io"
"log"
"os"
"path"
@ -1269,7 +1270,18 @@ func TestServerResponseGQLWithoutPermissions(t *testing.T) {
Search: searchConfig,
}
logFile, err := os.CreateTemp(t.TempDir(), "zot-log*.txt")
if err != nil {
panic(err)
}
logPath := logFile.Name()
defer os.Remove(logPath)
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
go func(controller *api.Controller) {
// this blocks
@ -1286,7 +1298,11 @@ func TestServerResponseGQLWithoutPermissions(t *testing.T) {
time.Sleep(100 * time.Millisecond)
}
time.Sleep(90 * time.Second)
_, err = test.ReadLogFileAndSearchString(logPath, "DB update completed, next update scheduled", 90*time.Second)
if err != nil {
panic(err)
}
defer func(controller *api.Controller) {
err = os.Chmod(path.Join(dir, "zot-test", "blobs"), 0o777)

17
pkg/extensions/search/cve/cve_test.go
View file

@ -8,6 +8,7 @@ import (
"context"
"encoding/json"
"fmt"
"io"
"net/http"
"os"
"path"
@ -419,7 +420,18 @@ func TestCVESearch(t *testing.T) {
Search: searchConfig,
}
logFile, err := os.CreateTemp(t.TempDir(), "zot-log*.txt")
if err != nil {
panic(err)
}
logPath := logFile.Name()
defer os.Remove(logPath)
writers := io.MultiWriter(os.Stdout, logFile)
ctlr := api.NewController(conf)
ctlr.Log.Logger = ctlr.Log.Output(writers)
go func() {
// this blocks
@ -438,7 +450,10 @@ func TestCVESearch(t *testing.T) {
}
// Wait for trivy db to download
time.Sleep(90 * time.Second)
_, err = ReadLogFileAndSearchString(logPath, "DB update completed, next update scheduled", 90*time.Second)
if err != nil {
panic(err)
}
defer func() {
ctx := context.Background()

22
pkg/test/common.go
View file

@ -13,6 +13,7 @@ import (
"net/url"
"os"
"path"
"strings"
"time"
godigest "github.com/opencontainers/go-digest"
@ -425,3 +426,24 @@ func UploadImage(img Image, baseURL, repo string) error {
return err
}
func ReadLogFileAndSearchString(logPath string, stringToMatch string, timeout time.Duration) (bool, error) {
ctx, cancelFunc := context.WithTimeout(context.Background(), timeout)
defer cancelFunc()
for {
select {
case <-ctx.Done():
return false, nil
default:
content, err := os.ReadFile(logPath)
if err != nil {
return false, err
}
if strings.Contains(string(content), stringToMatch) {
return true, nil
}
}
}
}

21
pkg/test/common_test.go
View file

@ -409,6 +409,27 @@ func TestInjectUploadImage(t *testing.T) {
})
}
func TestReadLogFileAndSearchString(t *testing.T) {
logFile, err := os.CreateTemp(t.TempDir(), "zot-log*.txt")
if err != nil {
panic(err)
}
logPath := logFile.Name()
defer os.Remove(logPath)
Convey("Invalid path", t, func() {
_, err = test.ReadLogFileAndSearchString("invalidPath", "DB update completed, next update scheduled", 90*time.Second)
So(err, ShouldNotBeNil)
})
Convey("Time too short", t, func() {
ok, err := test.ReadLogFileAndSearchString(logPath, "invalid string", time.Microsecond)
So(err, ShouldBeNil)
So(ok, ShouldBeFalse)
})
}
func startServer(c *api.Controller) {
// this blocks
ctx := context.Background()