From e80a3e277916aad7ee984f0e83c037136dc57d89 Mon Sep 17 00:00:00 2001 From: keliramu Date: Mon, 22 Jul 2024 10:16:57 +0300 Subject: [PATCH] Minor chages in mage.go Signed-off-by: keliramu --- magefiles/mage.go | 4 +++- test/qa/lib/daemon.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/magefiles/mage.go b/magefiles/mage.go index b8ca0d47..3d861c2a 100644 --- a/magefiles/mage.go +++ b/magefiles/mage.go @@ -9,6 +9,7 @@ import ( "os/exec" "path/filepath" "strings" + "time" "github.com/NordSecurity/nordvpn-linux/internal" @@ -23,7 +24,7 @@ const ( imageSnapPackager = registryPrefix + "snaper:0.0.2" imageProtobufGenerator = registryPrefix + "generator:1.1.0" imageScanner = registryPrefix + "scanner:1.1.0" - imageTester = registryPrefix + "tester:1.1.10" + imageTester = registryPrefix + "tester:1.2.0" imageQAPeer = registryPrefix + "qa-peer:1.0.4" imageRuster = registryPrefix + "ruster:1.1.0" @@ -607,6 +608,7 @@ func qaDocker(ctx context.Context, testGroup, testPattern string) (err error) { } else { fmt.Println(err) } + time.Sleep(3 * time.Second) err = RemoveDockerNetwork(context.Background(), networkID) if err != nil { fmt.Println(err) diff --git a/test/qa/lib/daemon.py b/test/qa/lib/daemon.py index a8c19fb1..0051528d 100644 --- a/test/qa/lib/daemon.py +++ b/test/qa/lib/daemon.py @@ -12,8 +12,8 @@ def _rewrite_log_path(): project_root = os.environ["WORKDIR"].replace("/", "\\/") pattern = f"s/^LOGFILE=.*/LOGFILE={project_root}\\/dist\\/logs\\/daemon.log/" + # this fn is executed only in docker (below line would not work under snap) sh.sudo.sed("-i", pattern, "/etc/init.d/nordvpn") - #os.popen(f"sudo sed -i {pattern} /etc/init.d/nordvpn").read() # returns True on SystemD distros