From 93f55d4339a5f5c4471cb7038e44979f9e820f7f Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 26 May 2021 12:00:00 +0200
Subject: [PATCH] finish refactor tests

---
 examples/consumer/getnext/CMakeLists.txt         |  4 ----
 examples/consumer/getnext/check_linux.sh         | 12 +-----------
 examples/consumer/getnext/check_windows.bat      |  5 +----
 examples/consumer/getnext_python/CMakeLists.txt  |  3 ---
 examples/consumer/getnext_python/check_linux.sh  | 10 ----------
 .../consumer/getnext_python/check_windows.bat    |  3 ---
 examples/consumer/getnext_python/getnext.py      |  2 +-
 examples/pipeline/in_to_out/CMakeLists.txt       |  2 --
 examples/pipeline/in_to_out/check_linux.sh       | 12 ------------
 examples/pipeline/in_to_out/check_windows.bat    |  3 ---
 .../pipeline/in_to_out_python/CMakeLists.txt     |  2 --
 .../pipeline/in_to_out_python/check_linux.sh     | 12 ------------
 .../pipeline/in_to_out_python/check_windows.bat  |  3 ---
 .../check_windows.bat                            |  3 ---
 .../next_multithread_broker/check_windows.bat    |  3 ---
 .../broker_mongo_restart/CMakeLists.txt          |  2 +-
 tests/automatic/producer_receiver/CMakeLists.txt |  6 +++---
 .../check_monitoring/CMakeLists.txt              |  2 --
 .../check_monitoring/check_linux.sh              | 12 ------------
 .../transfer_datasets/CMakeLists.txt             |  1 -
 .../transfer_datasets/check_linux.sh             | 10 ----------
 .../transfer_datasets/check_windows.bat          |  3 ---
 .../transfer_single_file/CMakeLists.txt          |  1 -
 .../transfer_single_file/check_linux.sh          | 16 ++--------------
 .../transfer_single_file/check_windows.bat       |  4 ----
 .../CMakeLists.txt                               |  1 -
 .../check_linux.sh                               | 12 ------------
 .../check_windows.bat                            |  3 ---
 28 files changed, 9 insertions(+), 143 deletions(-)

diff --git a/examples/consumer/getnext/CMakeLists.txt b/examples/consumer/getnext/CMakeLists.txt
index 1e7bd4ca7..6353d1706 100644
--- a/examples/consumer/getnext/CMakeLists.txt
+++ b/examples/consumer/getnext/CMakeLists.txt
@@ -14,10 +14,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
 get_target_property(VAR ${TARGET_NAME} RUNTIME_OUTPUT_DIRECTORY)
 add_dependencies(${TARGET_NAME} asapo-broker)
 
-
-prepare_asapo()
-
-configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/broker_settings.json settings.json COPYONLY)
 add_script_test("${TARGET_NAME}" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}")
 
 endif()
diff --git a/examples/consumer/getnext/check_linux.sh b/examples/consumer/getnext/check_linux.sh
index 2c853792c..2cb761da0 100644
--- a/examples/consumer/getnext/check_linux.sh
+++ b/examples/consumer/getnext/check_linux.sh
@@ -12,19 +12,9 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop broker
   	echo "db.dropDatabase()" | mongo ${database_name}
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run authorizer.nmd
-nomad run broker.nmd
-
 for i in `seq 1 3`;
 do
 	echo 'db.data_default.insert({"_id":'$i',"size":100,"name":"'$i'","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}})' | mongo ${database_name}
@@ -32,7 +22,7 @@ done
 
 sleep 1
 
-$@ 127.0.0.1:8400 $source_path $beamtime_id 2 $token_test_run 12000 1  | tee /dev/stderr | grep "Processed 3 file(s)"
+$@ 127.0.0.1:8400 $source_path $beamtime_id 2 $token_test_run 3000 1  | tee /dev/stderr | grep "Processed 3 file(s)"
 
 
 
diff --git a/examples/consumer/getnext/check_windows.bat b/examples/consumer/getnext/check_windows.bat
index 1a3db40df..2e0870e36 100644
--- a/examples/consumer/getnext/check_windows.bat
+++ b/examples/consumer/getnext/check_windows.bat
@@ -7,12 +7,10 @@ SET database_name=%beamtime_id%_%data_source%
 SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 set token_test_run=%BT_TEST_RUN_TOKEN%
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":100,"name":"%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %database_name%  || goto :error
 
 
-"%1" 127.0.0.1:8400 %source_path% %beamtime_id% 1 %token_test_run% 12000 1 | findstr /c:"Processed 3 file" || goto :error
+"%1" 127.0.0.1:8400 %source_path% %beamtime_id% 1 %token_test_run% 3000 1 | findstr /c:"Processed 3 file" || goto :error
 goto :clean
 
 :error
@@ -20,5 +18,4 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/examples/consumer/getnext_python/CMakeLists.txt b/examples/consumer/getnext_python/CMakeLists.txt
index a551c0903..6c0804e29 100644
--- a/examples/consumer/getnext_python/CMakeLists.txt
+++ b/examples/consumer/getnext_python/CMakeLists.txt
@@ -1,8 +1,5 @@
 set(TARGET_NAME getnext_python)
 
-
-prepare_asapo()
-
 if (UNIX)
     get_target_property(PYTHON_LIBS python-lib-consumer BINARY_DIR)
 else()
diff --git a/examples/consumer/getnext_python/check_linux.sh b/examples/consumer/getnext_python/check_linux.sh
index 50c4b25cf..9f6fb85bd 100644
--- a/examples/consumer/getnext_python/check_linux.sh
+++ b/examples/consumer/getnext_python/check_linux.sh
@@ -12,19 +12,9 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop broker
 	echo "db.dropDatabase()" | mongo ${database_name}
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run authorizer.nmd
-nomad run broker.nmd
-
 for i in `seq 1 3`;
 do
 	echo 'db.data_default.insert({"_id":'$i',"size":100,"name":"'$i'","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}})' | mongo ${database_name}
diff --git a/examples/consumer/getnext_python/check_windows.bat b/examples/consumer/getnext_python/check_windows.bat
index 9b96ec00e..e48e27bd8 100644
--- a/examples/consumer/getnext_python/check_windows.bat
+++ b/examples/consumer/getnext_python/check_windows.bat
@@ -7,8 +7,6 @@ SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 set token_test_run=%BT_TEST_RUN_TOKEN%
 set group_id=bif31l2uiddd4r0q6b40
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":100,"name":"%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %database_name%  || goto :error
 
 
@@ -44,5 +42,4 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/examples/consumer/getnext_python/getnext.py b/examples/consumer/getnext_python/getnext.py
index 0aec93df4..e521c98f5 100644
--- a/examples/consumer/getnext_python/getnext.py
+++ b/examples/consumer/getnext_python/getnext.py
@@ -6,7 +6,7 @@ import sys
 
 source, path, beamtime, token, group_id = sys.argv[1:]
 
-consumer = asapo_consumer.create_consumer(source,path,True, beamtime,"",token,60000)
+consumer = asapo_consumer.create_consumer(source,path,True, beamtime,"",token,5000)
 
 
 if group_id == "new":
diff --git a/examples/pipeline/in_to_out/CMakeLists.txt b/examples/pipeline/in_to_out/CMakeLists.txt
index efe0d0f8a..60e211fb0 100644
--- a/examples/pipeline/in_to_out/CMakeLists.txt
+++ b/examples/pipeline/in_to_out/CMakeLists.txt
@@ -9,7 +9,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
         ${CMAKE_CURRENT_BINARY_DIR}$<$<CONFIG:Debug>:>
         )
 
-prepare_asapo()
-
 add_script_test("${TARGET_NAME}" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}" nomem)
 
diff --git a/examples/pipeline/in_to_out/check_linux.sh b/examples/pipeline/in_to_out/check_linux.sh
index 120bad4d0..ceaeccdac 100644
--- a/examples/pipeline/in_to_out/check_linux.sh
+++ b/examples/pipeline/in_to_out/check_linux.sh
@@ -25,12 +25,6 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop broker
-    nomad stop receiver
-    nomad stop authorizer
 	  echo "db.dropDatabase()" | mongo ${indatabase_name}
 	  echo "db.dropDatabase()" | mongo ${outdatabase_name}
     echo "db.dropDatabase()" | mongo ${outdatabase_name2}
@@ -40,12 +34,6 @@ Cleanup() {
 
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run broker.nmd
-nomad run receiver_tcp.nmd
-nomad run authorizer.nmd
-
 mkdir -p $receiver_folder
 mkdir processed
 echo hello1 > processed/file1
diff --git a/examples/pipeline/in_to_out/check_windows.bat b/examples/pipeline/in_to_out/check_windows.bat
index 57485dbe4..c2f2b91da 100644
--- a/examples/pipeline/in_to_out/check_windows.bat
+++ b/examples/pipeline/in_to_out/check_windows.bat
@@ -18,8 +18,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d
 
 SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":6,"name":"processed\\file%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %indatabase_name%  || goto :error
 
 mkdir %receiver_folder%
@@ -58,7 +56,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 
 echo db.dropDatabase() | %mongo_exe% %indatabase_name%
 echo db.dropDatabase() | %mongo_exe% %outdatabase_name%
diff --git a/examples/pipeline/in_to_out_python/CMakeLists.txt b/examples/pipeline/in_to_out_python/CMakeLists.txt
index bdac25363..f145b0aa2 100644
--- a/examples/pipeline/in_to_out_python/CMakeLists.txt
+++ b/examples/pipeline/in_to_out_python/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME pipeline_inout_python)
 
-prepare_asapo()
-
 if (UNIX)
     get_target_property(PYTHON_LIBS_CONSUMER python-lib-consumer BINARY_DIR)
     get_target_property(PYTHON_LIBS_PRODUCER python-lib-producer BINARY_DIR)
diff --git a/examples/pipeline/in_to_out_python/check_linux.sh b/examples/pipeline/in_to_out_python/check_linux.sh
index 12f7444f8..4a1a74385 100644
--- a/examples/pipeline/in_to_out_python/check_linux.sh
+++ b/examples/pipeline/in_to_out_python/check_linux.sh
@@ -29,12 +29,6 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop broker
-    nomad stop receiver
-    nomad stop authorizer
     echo "db.dropDatabase()" | mongo ${indatabase_name}
   	echo "db.dropDatabase()" | mongo ${outdatabase_name}
   	rm -rf processed
@@ -43,12 +37,6 @@ Cleanup() {
 
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run broker.nmd
-nomad run receiver_tcp.nmd
-nomad run authorizer.nmd
-
 mkdir -p $receiver_folder
 
 mkdir processed
diff --git a/examples/pipeline/in_to_out_python/check_windows.bat b/examples/pipeline/in_to_out_python/check_windows.bat
index ff761ad82..44d24a150 100644
--- a/examples/pipeline/in_to_out_python/check_windows.bat
+++ b/examples/pipeline/in_to_out_python/check_windows.bat
@@ -20,8 +20,6 @@ SET timeout=2
 SET timeout_producer=25
 SET nthreads=4
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":6,"name":"processed\\file%%x","timestamp":1,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %indatabase_name%  || goto :error
 
 mkdir %receiver_folder%
@@ -53,7 +51,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 echo db.dropDatabase() | %mongo_exe% %indatabase_name%
 echo db.dropDatabase() | %mongo_exe% %outdatabase_name%
 rmdir /S /Q %receiver_root_folder%
diff --git a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat
index 99fff14fb..c0fd0a128 100644
--- a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat
+++ b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat
@@ -8,8 +8,6 @@ SET dbname = %beamtime_id%_%data_source%
 
 echo db.%dbname%.insert({dummy:1})" | %mongo_exe% %dbname%
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 echo test > file1
@@ -29,7 +27,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %dbname%
 
diff --git a/tests/automatic/consumer/next_multithread_broker/check_windows.bat b/tests/automatic/consumer/next_multithread_broker/check_windows.bat
index d995d7cec..8649820ff 100644
--- a/tests/automatic/consumer/next_multithread_broker/check_windows.bat
+++ b/tests/automatic/consumer/next_multithread_broker/check_windows.bat
@@ -2,8 +2,6 @@ SET database_name=test_run_detector
 SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 set token_test_run=%BT_TEST_RUN_TOKEN%
 
-call start_services.bat
-
 for /l %%x in (1, 1, 10) do echo db.data_default.insert({"_id":%%x,"size":100,"name":"%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %database_name%  || goto :error
 
 
@@ -16,6 +14,5 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt b/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt
index 22840923a..9c50d1887 100644
--- a/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt
+++ b/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt
@@ -3,5 +3,5 @@ set(TARGET_NAME broker_mongo_restart)
 ################################
 # Testing
 ################################
-configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/admin_token.key admin_token.key COPYONLY)
+prepare_asapo()
 add_script_test("${TARGET_NAME}-tcp" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> tcp" nomem)
diff --git a/tests/automatic/producer_receiver/CMakeLists.txt b/tests/automatic/producer_receiver/CMakeLists.txt
index e70ec3340..fe492ed04 100644
--- a/tests/automatic/producer_receiver/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/CMakeLists.txt
@@ -2,6 +2,6 @@ add_subdirectory(transfer_single_file)
 add_subdirectory(transfer_single_file_bypass_buffer)
 add_subdirectory(transfer_datasets)
 
-if (UNIX)
-    add_subdirectory(check_monitoring)
-endif()
\ No newline at end of file
+#if (UNIX) #removed since monitoring willbe refactored anyway
+#    add_subdirectory(check_monitoring)
+#endif()
\ No newline at end of file
diff --git a/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt b/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt
index 80b82ae8e..6ebdc0c1f 100644
--- a/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt
@@ -3,6 +3,4 @@ set(TARGET_NAME receiver)
 ################################
 # Testing
 ################################
-prepare_asapo()
-
 add_script_test("${TARGET_NAME}-monitoring" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/check_monitoring/check_linux.sh b/tests/automatic/producer_receiver/check_monitoring/check_linux.sh
index f15796847..cf0863c9b 100644
--- a/tests/automatic/producer_receiver/check_monitoring/check_linux.sh
+++ b/tests/automatic/producer_receiver/check_monitoring/check_linux.sh
@@ -15,24 +15,12 @@ trap Cleanup EXIT
 Cleanup() {
 	echo cleanup
 	influx -execute "drop database ${database_name}"
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     rm -rf ${receiver_root_folder}
 }
 
 mkdir -p ${receiver_folder}
 
-nomad run authorizer.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-nomad run nginx.nmd
-
-sleep 1
-
 $1 localhost:8400 ${beamtime_id} 100 112 4  0 100
 
 sleep 2
diff --git a/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt b/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt
index b29b867f1..cdc5cb2b4 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt
@@ -3,5 +3,4 @@ set(TARGET_NAME transfer-datasets)
 ################################
 # Testing
 ################################
-prepare_asapo()
 add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
index 0847e13fe..f1e6b662d 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
@@ -16,11 +16,6 @@ receiver_folder=${receiver_root_folder}/${facility}/gpfs/${beamline}/${year}/dat
 Cleanup() {
 	echo cleanup
 	rm -rf ${receiver_root_folder}
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     influx -execute "drop database ${database_name}"
 }
@@ -31,11 +26,6 @@ echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
 # create db before consumer starts reading it. todo: git rid of it
 echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector
 
-nomad run authorizer.nmd
-nomad run nginx.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-
 mkdir -p ${receiver_folder}
 
 $1 localhost:8400 ${beamtime_id} 100 1 1 0 30 3
diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat b/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
index 71219ec2e..0caa38f21 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
@@ -7,8 +7,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d
 
 echo db.%beamtime_id%_detector.insert({dummy:1})" | %mongo_exe% %beamtime_id%_detector
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 "%1" 127.0.0.1:8400 %beamtime_id% 100 1 1 0 30 3
@@ -36,7 +34,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
 
diff --git a/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt b/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt
index 7b299ca60..79a432652 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt
@@ -3,5 +3,4 @@ set(TARGET_NAME transfer-single-file)
 ################################
 # Testing
 ################################
-prepare_asapo()
 add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
index c0d3435ce..a07e7355d 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
@@ -16,27 +16,15 @@ receiver_folder=${receiver_root_folder}/${facility}/gpfs/${beamline}/${year}/dat
 Cleanup() {
 	echo cleanup
 	rm -rf ${receiver_root_folder}
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${database_name}"
+  echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
+  influx -execute "drop database ${database_name}"
 }
 
 # create db before consumer starts reading it. todo: git rid of it
 echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector
 
-nomad run authorizer.nmd
-nomad run nginx.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-
 mkdir -p ${receiver_folder}
 
-sleep 1
-
 $1 localhost:8400 ${beamtime_id} 100 1 1  0 30
 
 ls -ln ${receiver_folder}/processed/1 | awk '{ print $5 }'| grep 100000
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
index ce3967d72..3eb1cc0b0 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
@@ -4,11 +4,8 @@ SET beamline=test
 SET receiver_root_folder=c:\tmp\asapo\receiver\files
 SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\data\%beamtime_id%"
 
-
 echo db.%beamtime_id%_detector.insert({dummy:1})" | %mongo_exe% %beamtime_id%_detector
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 "%1" 127.0.0.1:8400 %beamtime_id% 100 1 1 0 30
@@ -27,7 +24,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
 
diff --git a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt
index c203baaa6..46f9fe9a4 100644
--- a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt
@@ -3,5 +3,4 @@ set(TARGET_NAME transfer-single-file_bypass)
 ################################
 # Testing
 ################################
-prepare_asapo()
 add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh
index bcd84032b..1635d54f1 100644
--- a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh
@@ -17,11 +17,6 @@ Cleanup() {
 
 	echo cleanup
 	rm -rf ${receiver_root_folder}
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     influx -execute "drop database ${database_name}"
 }
@@ -29,15 +24,8 @@ Cleanup() {
 # create db before consumer starts reading it. todo: git rid of it
 echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector
 
-nomad run authorizer.nmd
-nomad run nginx.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-
 mkdir -p ${receiver_folder}
 
-sleep 1
-
 $1 localhost:8400 ${beamtime_id} 60000 1 1  0 30
 
 echo "db.data_default.find({"_id":1})" | mongo ${beamtime_id}_detector  > out
diff --git a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat
index 7ddac5f47..edef2db16 100644
--- a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat
@@ -7,8 +7,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d
 
 echo db.%beamtime_id%_detector.insert({dummy:1})" | %mongo_exe% %beamtime_id%_detector
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 "%1" 127.0.0.1:8400 %beamtime_id% 60000 1 1 0 30
@@ -30,7 +28,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
 
-- 
GitLab