fix some tests

tests/automatic/consumer/consumer_api/consumer_api.cpp

@@ -327,7 +327,7 @@ void TestAll(const Args& args) {
         exit(EXIT_FAILURE);
     }
 
-    consumer->SetTimeout(100);
+    consumer->SetTimeout(1000);
     auto group_id = consumer->GenerateNewGroupId(&err);
 
     if (args.datasets == "single") {

tests/automatic/full_chain/simple_chain/check_linux.sh

@@ -41,4 +41,3 @@ $producer_bin localhost:8400 ${beamtime_id} 100 1000 4 0 100
 echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 2000 1 | tee out
 grep "Processed 1000 file(s)" out
-grep -i "Using connection type: No connection" out

tests/automatic/full_chain/simple_chain_dataset/check_linux.sh

@@ -41,5 +41,4 @@ echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 5000 1 1 | tee out
 grep "Processed 100 dataset(s)" out
 grep "with 500 file(s)" out
-grep -i "Using connection type: No connection" out
 

tests/automatic/full_chain/simple_chain_filegen/check_linux.sh

@@ -51,7 +51,6 @@ echo hello > /tmp/asapo/test_in/processed/test2/file1
 echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 1000 1 | tee /dev/stderr out
 grep "Processed 3 file(s)" out
-grep -i "Using connection type: No connection" out
 
 test ! -f /tmp/asapo/test_in/processed/test1/file1
 test ! -f /tmp/asapo/test_in/processed/test1/file2

tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh

@@ -54,7 +54,6 @@ echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 2000 1 1 | tee out
 grep "Processed 1 dataset(s)" out
 grep "with 3 file(s)" out
-grep -i "Using connection type: No connection" out
 
 test -f /tmp/asapo/test_in/processed/test1/file1
 test -f /tmp/asapo/test_in/processed/test1/file2

tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh

@@ -61,4 +61,3 @@ echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} $network_type ${receiver_folder} ${beamtime_id} 2 $token 2000 1 1 | tee out
 grep "Processed 2 dataset(s)" out
 grep "with 4 file(s)" out
-grep -i "Using connection type: No connection" out

tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat

@@ -42,7 +42,6 @@ REM consumer
 type out.txt
 findstr /i /l /c:"Processed 2 dataset(s)" out.txt || goto :error
 findstr /i /l /c:"with 4 file(s)" out.txt || goto :error
-findstr /i /l /c:"Using connection type: No connection" out.txt || goto :error
 
 goto :clean
 

tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh

@@ -56,5 +56,4 @@ grep "Processed 3 file(s)" out.txt
 grep "hello1" out.txt
 grep "hello2" out.txt
 grep "hello3" out.txt
-grep -i "Using connection type: No connection" out.txt
 

tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat

@@ -40,7 +40,6 @@ findstr /i /l /c:"Processed 3 file(s)" out.txt || goto :error
 findstr /i /l /c:"hello1" out.txt || goto :error
 findstr /i /l /c:"hello2" out.txt || goto :error
 findstr /i /l /c:"hello3" out.txt || goto :error
-findstr /i /l /c:"Using connection type: No connection" out.txt || goto :error
 
 
 goto :clean

tests/automatic/full_chain/simple_chain_metadata/check_linux.sh

@@ -40,4 +40,3 @@ $producer_bin localhost:8400 ${beamtime_id} 100 0 1 0 1000
 echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 1000 1 | tee out
 grep "dummy_meta" out
-grep -i "Using connection type: No connection" out

tests/automatic/full_chain/two_beamlines/CMakeLists.txt

@@ -3,12 +3,11 @@ set(TARGET_NAME full_chain_two_beamlines)
 ################################
 # Testing
 ################################
-add_script_test("${TARGET_NAME}-tcp" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> tcp" nomem)
 prepare_asapo()
 
+add_script_test("${TARGET_NAME}-tcp" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> tcp" nomem)
 if (ENABLE_LIBFABRIC)
     if (ENABLE_LIBFABRIC_LOCALHOST)
-        configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver_fabric.json.tpl.lin.in receiver_fabric.json.tpl @ONLY)
         add_script_test("${TARGET_NAME}-fabric" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> fabric" nomem)
     else ()
         message(WARNING "Disabled automated LibFabric of '${TARGET_NAME}-fabric' test because 'ENABLE_LIBFABRIC_LOCALHOST' is not enabled.")