From 13f23b707b6136ef4641e7eb4e54555a3411e18d Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 7 Apr 2020 09:40:42 +0200
Subject: [PATCH] kill nginx on windows properly
---
config/nomad/nginx_kill_win.nmd | 2 +-
.../simple_chain_metadata/check_windows.bat | 13 +++++++++++++
tests/automatic/settings/nginx.conf.tpl | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/config/nomad/nginx_kill_win.nmd b/config/nomad/nginx_kill_win.nmd
index 978b98d4b..3480ab652 100644
--- a/config/nomad/nginx_kill_win.nmd
+++ b/config/nomad/nginx_kill_win.nmd
@@ -11,7 +11,7 @@ job "nginx_kill" {
driver = "raw_exec"
config {
command = "taskkill",
- args = ["/f","/im","nginx_exe.exe"]
+ args = ["/f","/im","nginx.exe"]
}
}
}
diff --git a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
index 536df36ff..399df73f5 100644
--- a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
@@ -20,6 +20,19 @@ c:\opt\consul\nomad run nginx.nmd
ping 1.0.0.0 -n 10 -w 100 > nul
+set i=0
+:repeat
+set /a i=%i%+1
+echo %i%
+if %i% EQU 20 (
+ goto :error
+)
+timeout /t 1
+curl --fail 127.0.0.1:8400/asapo-discovery/asapo-receiver || goto :repeat
+curl --fail 127.0.0.1:8400/asapo-discovery/asapo-broker|| goto :repeat
+echo discovery ready
+
+
REM producer
mkdir %receiver_folder%
"%1" %proxy_address% %beamtime_id% 100 0 1 0 1000
diff --git a/tests/automatic/settings/nginx.conf.tpl b/tests/automatic/settings/nginx.conf.tpl
index b4a518fcd..09a376250 100644
--- a/tests/automatic/settings/nginx.conf.tpl
+++ b/tests/automatic/settings/nginx.conf.tpl
@@ -1,5 +1,5 @@
worker_processes 1;
-
+daemon off;
events {
worker_connections 1024;
}
--
GitLab