From e0fa8b3f726e94d29121287fd1ec3ab68193d924 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 26 May 2021 13:07:25 +0200
Subject: [PATCH] fix test
---
CMakeModules/prepare_asapo.cmake | 3 ---
.../common_scripts/start_authorizer.bat | 24 -------------------
.../common_scripts/stop_authorizer.bat | 3 ---
.../check_linux.sh | 1 -
4 files changed, 31 deletions(-)
delete mode 100644 tests/automatic/common_scripts/start_authorizer.bat
delete mode 100644 tests/automatic/common_scripts/stop_authorizer.bat
diff --git a/CMakeModules/prepare_asapo.cmake b/CMakeModules/prepare_asapo.cmake
index 66c7e5251..bcf2db0fc 100644
--- a/CMakeModules/prepare_asapo.cmake
+++ b/CMakeModules/prepare_asapo.cmake
@@ -27,9 +27,6 @@ function(prepare_asapo)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/authorizer_settings.json.tpl.win authorizer.json.tpl COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/start_services.bat start_services.bat COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/stop_services.bat stop_services.bat COPYONLY)
- configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/start_authorizer.bat start_authorizer.bat COPYONLY)
- configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/stop_authorizer.bat stop_authorizer.bat COPYONLY)
-
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/receiver_tcp.nmd.in receiver_tcp.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/nginx_kill_win.nmd nginx_kill.nmd @ONLY)
else()
diff --git a/tests/automatic/common_scripts/start_authorizer.bat b/tests/automatic/common_scripts/start_authorizer.bat
deleted file mode 100644
index de5ada62f..000000000
--- a/tests/automatic/common_scripts/start_authorizer.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-c:\opt\consul\nomad run authorizer.nmd
-c:\opt\consul\nomad run nginx.nmd
-
-ping 192.0.2.1 -n 1 -w 3000 > nul
-
-set i=0
-:repeat
-set /a i=%i%+1
-echo %i%
-if %i% EQU 20 (
- goto :error
-)
-ping 192.0.2.1 -n 1 -w 1000 >nul
-curl --silent --data "" 127.0.0.1:8400/asapo-authorizer/authorize --stderr - | findstr /c:"Bad Request" || goto :repeat
-echo asapo services ready
-
-goto :clean
-
-:error
-echo error starting asapo services
-call :clean
-exit /b 1
-
-:clean
diff --git a/tests/automatic/common_scripts/stop_authorizer.bat b/tests/automatic/common_scripts/stop_authorizer.bat
deleted file mode 100644
index 27b0b30b9..000000000
--- a/tests/automatic/common_scripts/stop_authorizer.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-c:\opt\consul\nomad stop authorizer
-c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd && c:\opt\consul\nomad stop -yes -purge nginx_kill
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh
index 59992c6e4..e02147fd6 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh
@@ -28,7 +28,6 @@ Cleanup() {
rm -rf /tmp/asapo/test_in
rm -rf ${receiver_folder}
influx -execute "drop database ${monitor_database_name}"
- nomad stop authorizer
echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
rm out.txt
}
--
GitLab