diff --git a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh index c525981406ced44181ed86166e1e08dee1b7baa4..675a58d3f66b89036d0a471bec8716db5616887a 100644 --- a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh +++ b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh @@ -21,8 +21,6 @@ Cleanup() { export PYTHONPATH=$2:${PYTHONPATH} -echo "db.${beamtime_id}_${data_source}.insert({dummy:1})" | mongo ${beamtime_id}_${data_source} >/dev/null - mkdir -p ${receiver_folder} echo test > file1 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 c0fd0a1287af8ac39c2fa19660556a09db72655d..2f605ae7ca9b111e1a3238de2369ed341346181b 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 @@ -6,8 +6,6 @@ SET receiver_root_folder=c:\tmp\asapo\receiver\files SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\data\%beamtime_id%" SET dbname = %beamtime_id%_%data_source% -echo db.%dbname%.insert({dummy:1})" | %mongo_exe% %dbname% - mkdir %receiver_folder% echo test > file1 diff --git a/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat b/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat index 986a5506e6d98b1154a7ca6f530234338c13a240..055e6efbb8bfa4d319d99979d61bd3094678fc46 100644 --- a/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat +++ b/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat @@ -8,8 +8,6 @@ set producer_short_name="%~nx1" set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain/check_linux.sh b/tests/automatic/full_chain/simple_chain/check_linux.sh index 0ef800e40b72cc79b4b5afc22d6125d3d7894ad5..a442e63f4227d6554285670167db9ab334e8c850 100755 --- a/tests/automatic/full_chain/simple_chain/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain/check_linux.sh @@ -28,12 +28,8 @@ Cleanup() { influx -execute "drop database ${monitor_database_name}" } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector -echo "db.dropDatabase()" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` - echo "Start producer" mkdir -p ${receiver_folder} $producer_bin localhost:8400 ${beamtime_id} 100 1000 4 0 100 diff --git a/tests/automatic/full_chain/simple_chain/check_windows.bat b/tests/automatic/full_chain/simple_chain/check_windows.bat index 8ce75eb68b45b6ebcbe7b1ab9381cc18169046f9..9fc0808fa01e5b2957fdb750eeec5c074f5945cc 100644 --- a/tests/automatic/full_chain/simple_chain/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain/check_windows.bat @@ -7,8 +7,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh b/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh index b6c57df2037f72ea97556223f1b36914144971c2..165f48f54a0dbeb636017751b44967b1fb209b34 100644 --- a/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh @@ -29,8 +29,6 @@ Cleanup() { influx -execute "drop database ${monitor_database_name}" } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` echo "Start producer" diff --git a/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat b/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat index 9e29ddb7d3f08ab7138d73db252636d68b4376ab..d666562e80474de97ddd16d04c0b0044901ed785 100644 --- a/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat @@ -6,7 +6,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh index 25bbf6f200c33211b0876d5cf01e0726325d4cca..574ecb64874ed538baa03bd16e2113029c6f4e3b 100644 --- a/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh @@ -29,8 +29,6 @@ Cleanup() { echo "db.dropDatabase()" | mongo ${beamtime_id}_detector } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` echo "Start producer" diff --git a/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat index 105fb4e92c169e21fc21e263a451ca7785e606b8..383366fa1918557fc34053caea329f22270e8fd0 100644 --- a/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat @@ -8,8 +8,6 @@ set producer_short_name="%~nx1" set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh index 070a4bf7563af44d8fb8bfef24aed800fd290e82..fa9bb68319f07390fb3e747856b252eac9792b18 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh @@ -31,8 +31,6 @@ Cleanup() { rm -rf out } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` #producer diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat index 9b9244d6249ebba3c9470fd395f4a5ac1a9c5d37..2a0538172457f0b78efcdfecc9b6024736400a88 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat @@ -8,8 +8,6 @@ set producer_short_name="%~nx1" set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh index ad6c963d362aba5671c96a93d02ba5b845c4c10f..3667ba2ed424d8613c517eea3cd63d316382ad80 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh @@ -31,8 +31,6 @@ Cleanup() { rm -rf out } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` mkdir -p /tmp/asapo/test_in1/processed diff --git a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat index 732a90fa6a0a0f516f6fde2eb2e756249d0ecc68..5f7a5f9af3d2cbe2ed1ff362d10a0b4bfa06af2d 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat @@ -8,8 +8,6 @@ set producer_short_name="%~nx1" set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh index 9cd94ca9d3760bc0bbeffe5fc79071e6a6f5ffee..75f55f13a47f542f8bfeec9a893c9842b78d2f4c 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh @@ -38,9 +38,6 @@ Cleanup() { rm out.txt } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - - if [[ $network_type == "fabric" ]]; then nomad stop receiver nomad run receiver_fabric.nmd diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat index 0a54f44ba46a98d97dc8d449936db49ebfc310e3..ae61bf27db4ff394ff65bba041e7df804a9e9819 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat @@ -8,8 +8,6 @@ set producer_short_name="%~nx1" set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token 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 abcf4feac9867b35ffbab4250d106dea6b41f08a..5cfa9a4e7f821b70a338658dc70bece5d4e3d0f2 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 @@ -32,8 +32,6 @@ Cleanup() { rm out.txt } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat index bfe1901291312e5e88a181e5a7c826893c3a3dee..186404bc68d1f4883798a0c5e836958d64b2ba3c 100644 --- a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat @@ -10,8 +10,6 @@ set producer_short_name="%~nx1" set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh b/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh index abb9995dbb425a9244b090079cee89d3c9f039de..3d9103f83b59123012d41cc5648b4ecb51f95d37 100644 --- a/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh @@ -28,8 +28,6 @@ Cleanup() { influx -execute "drop database ${monitor_database_name}" } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` 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 3551790bbbf50ae8795aab76aabc2360293d08cd..fc5283fe047d782f5676a2aa32aa44612420b184 100644 --- a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat @@ -6,8 +6,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh b/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh index 0a5e90992636119030c8e016a29246150940dd17..53a8e3485a0bd5e016653b430aedf0890e004e9d 100644 --- a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh @@ -27,8 +27,6 @@ Cleanup() { influx -execute "drop database ${monitor_database_name}" } -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` diff --git a/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat b/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat index 338aa65eed4c57dd5d81934a7b3b02e80c8aacbf..d965adb884c6392bf721249bec51869cc4d6886e 100644 --- a/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat @@ -6,8 +6,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_detector.insert({dummy:1}) | %mongo_exe% %beamtime_id%_detector - "%2" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/full_chain/two_beamlines/check_linux.sh b/tests/automatic/full_chain/two_beamlines/check_linux.sh index ee0fc635ee1bd4feaeaeeb06291dbd45df2f1681..eaa344330bdae41c79f89e0034964fe610214e64 100644 --- a/tests/automatic/full_chain/two_beamlines/check_linux.sh +++ b/tests/automatic/full_chain/two_beamlines/check_linux.sh @@ -39,9 +39,6 @@ Cleanup() { influx -execute "drop database ${monitor_database_name}" } -echo "db.${beamtime_id1}_${data_source}.insert({dummy:1})" | mongo ${beamtime_id1}_${data_source} -echo "db.${beamtime_id2}_${data_source}.insert({dummy:1})" | mongo ${beamtime_id2}_${data_source} - if [[ $network_type == "fabric" ]]; then nomad stop receiver nomad run receiver_fabric.nmd diff --git a/tests/automatic/full_chain/two_beamlines/check_windows.bat b/tests/automatic/full_chain/two_beamlines/check_windows.bat index 968f7e4fe13630ef0e679f2e86b50e51a7292715..c1e4cb978302d3577f8fd3f0cd643056f540c1a4 100644 --- a/tests/automatic/full_chain/two_beamlines/check_windows.bat +++ b/tests/automatic/full_chain/two_beamlines/check_windows.bat @@ -15,9 +15,6 @@ SET receiver_folder2="%receiver_root_folder%\%facility%\gpfs\%beamline2%\%year%\ set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id1%_%data_source%.insert({dummy:1}) | %mongo_exe% %beamtime_id1%_%data_source% -echo db.%beamtime_id2%_%data_source%.insert({dummy:1}) | %mongo_exe% %beamtime_id2%_%data_source% - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id1% > token set /P token1=< token "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id2% > token diff --git a/tests/automatic/full_chain/two_streams/check_linux.sh b/tests/automatic/full_chain/two_streams/check_linux.sh index 0021c179868ecb14264973e50142243ee8949a8e..59fc1873592249e956ed0d57b0571fcb71e88d69 100644 --- a/tests/automatic/full_chain/two_streams/check_linux.sh +++ b/tests/automatic/full_chain/two_streams/check_linux.sh @@ -31,9 +31,6 @@ Cleanup() { echo "db.dropDatabase()" | mongo ${beamtime_id}_${stream2} } -echo "db.${beamtime_id}_${stream1}.insert({dummy:1})" | mongo ${beamtime_id}_${stream1} -echo "db.${beamtime_id}_${stream2}.insert({dummy:1})" | mongo ${beamtime_id}_${stream2} - token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` echo "Start producers" diff --git a/tests/automatic/full_chain/two_streams/check_windows.bat b/tests/automatic/full_chain/two_streams/check_windows.bat index ee45bc72f48e25cffc3a5bae95e7d8a7e5aa7bcd..01d64a1de995d530ea6f8d5f1cd1afcbd64dfa3a 100644 --- a/tests/automatic/full_chain/two_streams/check_windows.bat +++ b/tests/automatic/full_chain/two_streams/check_windows.bat @@ -10,9 +10,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d set proxy_address="127.0.0.1:8400" -echo db.%beamtime_id%_%stream1%.insert({dummy:1}) | %mongo_exe% %beamtime_id%_%stream1% -echo db.%beamtime_id%_%stream2%.insert({dummy:1}) | %mongo_exe% %beamtime_id%_%stream2% - "%3" token -endpoint http://127.0.0.1:8400/asapo-authorizer -secret admin_token.key -types read %beamtime_id% > token set /P token=< token diff --git a/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh b/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh index 3c5a218c266387267755606195a34512b2ec65c9..2e40ee88eaeb8155fd9de4e11c5bd7557ab84f41 100755 --- a/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh +++ b/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh @@ -74,9 +74,6 @@ sleep 2 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo --port 27016 ${beamtime_id}_detector - - echo "Start producer" mkdir -p ${receiver_folder} $producer_bin localhost:8400 ${beamtime_id} 100 1000 4 0 100 & diff --git a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh index b01c925efe9663cb836b2307b600fe8a9706b822..6ce5943adaf3bf7d6c76c80e958a74f2f0862a50 100644 --- a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh +++ b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh @@ -51,9 +51,6 @@ start_mongo wait_mongo -# create db before consumer starts reading it. todo: git rid of it -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo --port 27016 ${beamtime_id}_detector - sed -i 's/27017/27016/g' discovery.json.tpl nomad stop discovery nomad run discovery.nmd diff --git a/tests/automatic/high_avail/services_restart/check_linux.sh b/tests/automatic/high_avail/services_restart/check_linux.sh index d8324f4daea6f4efc78be659de3bf218f06c1408..7043c1ac971b7c8dac5b21cd1b8b3bc02a384a8c 100644 --- a/tests/automatic/high_avail/services_restart/check_linux.sh +++ b/tests/automatic/high_avail/services_restart/check_linux.sh @@ -31,8 +31,6 @@ Cleanup() { token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id` -echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector - echo "Start producer" $producer_bin localhost:8400 ${beamtime_id} 100 $5 4 0 100 & #producerid=`echo $!` diff --git a/tests/automatic/producer/aai/check_windows.bat b/tests/automatic/producer/aai/check_windows.bat index ee7e2b23055ef64869aee4f80198ca5d16434629..b576b7e959e9addbd90f46051ca0a5e6c8055994 100644 --- a/tests/automatic/producer/aai/check_windows.bat +++ b/tests/automatic/producer/aai/check_windows.bat @@ -11,10 +11,6 @@ SET dbname2=%beamtime_id2%_%data_source% SET token=%BLP07_W_TOKEN% SET beamline_dir=c:\tmp\asapo\beamline\p07\current\ - - -echo db.%dbname%.insert({dummy:1})" | %mongo_exe% %dbname% - mkdir %receiver_folder% mkdir %receiver_folder2% diff --git a/tests/automatic/producer/python_api/check_linux.sh b/tests/automatic/producer/python_api/check_linux.sh index 4d677c18aae9d896544951ff7b034ca9850a0a80..c86f6bd6ae66428eb24dcc37703577a70953d1a3 100644 --- a/tests/automatic/producer/python_api/check_linux.sh +++ b/tests/automatic/producer/python_api/check_linux.sh @@ -21,8 +21,6 @@ Cleanup() { export PYTHONPATH=$2:${PYTHONPATH} -echo "db.${beamtime_id}_${data_source}.insert({dummy:1})" | mongo ${beamtime_id}_${data_source} >/dev/null - mkdir -p ${receiver_folder} echo test > file1 diff --git a/tests/automatic/producer/python_api/check_windows.bat b/tests/automatic/producer/python_api/check_windows.bat index 8ae2e338226684a502058ce7355da2a38e76477e..6dbbf441a3e80626d3e7405915e3bf21a49b7fcb 100644 --- a/tests/automatic/producer/python_api/check_windows.bat +++ b/tests/automatic/producer/python_api/check_windows.bat @@ -6,8 +6,6 @@ SET receiver_root_folder=c:\tmp\asapo\receiver\files SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\data\%beamtime_id%" SET dbname=%beamtime_id%_%data_source% -echo db.%dbname%.insert({dummy:1})" | %mongo_exe% %dbname% - mkdir %receiver_folder% echo test > file1 diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh index f1e6b662d50ec06383485610a8fc563f7135a704..2207d5a305ee1b0fa8e1288672bbfe7619ab5c16 100644 --- a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh +++ b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh @@ -20,12 +20,6 @@ Cleanup() { influx -execute "drop database ${database_name}" } -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 - 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 0caa38f21a0ec805b85e30d5a3776268be9c97e1..f380010943b8129af8061070b21f8961408c1f9b 100644 --- a/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat +++ b/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat @@ -5,8 +5,6 @@ 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 - mkdir %receiver_folder% "%1" 127.0.0.1:8400 %beamtime_id% 100 1 1 0 30 3 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 a07e7355de1baa7833fbb829c4f4e230319eba98..90d116c91ce60bbb7c9a4a4a2ab1b84119ab6477 100644 --- a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh +++ b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh @@ -20,9 +20,6 @@ Cleanup() { 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 - mkdir -p ${receiver_folder} $1 localhost:8400 ${beamtime_id} 100 1 1 0 30 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 3eb1cc0b08027b7148b8a9aae0ea8a98cb2b82b8..afcbb8dd81b1d2206bd75a52682e8390a86c25ce 100644 --- a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat +++ b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat @@ -4,8 +4,6 @@ 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 - mkdir %receiver_folder% "%1" 127.0.0.1:8400 %beamtime_id% 100 1 1 0 30 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 1635d54f1e1c7129aba3f8b38c1b8145cc2ce41f..1da3b56b61ce312af68c19ec582e0c2cc6e056c5 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 @@ -21,9 +21,6 @@ Cleanup() { 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 - mkdir -p ${receiver_folder} $1 localhost:8400 ${beamtime_id} 60000 1 1 0 30 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 edef2db16b27994e328bb2a1a92ffc143b7d6057..bfe4dc45961791ac39cd885616bbe4b01ec43b07 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 @@ -4,9 +4,6 @@ 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 - mkdir %receiver_folder% "%1" 127.0.0.1:8400 %beamtime_id% 60000 1 1 0 30