diff --git a/examples/consumer/getnext_python/check_linux.sh b/examples/consumer/getnext_python/check_linux.sh index 9f6fb85bd8f428a51c2cc9a163255c8e217ba456..543137fc30f5a771c5d12e55a5715bcaed2c0cec 100644 --- a/examples/consumer/getnext_python/check_linux.sh +++ b/examples/consumer/getnext_python/check_linux.sh @@ -20,7 +20,7 @@ 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} done -echo 'db.meta.insert({"_id":0,"meta_test":"test"})' | mongo ${database_name} +echo 'db.meta.insert({"_id":"bt","meta_test":"test"})' | mongo ${database_name} sleep 1 diff --git a/examples/consumer/getnext_python/check_windows.bat b/examples/consumer/getnext_python/check_windows.bat index e48e27bd8c3a9a23fef9fb366ac6ef564a297057..f69c97c8e42ce2de5bf0990f1dd9ad2196d4a05d 100644 --- a/examples/consumer/getnext_python/check_windows.bat +++ b/examples/consumer/getnext_python/check_windows.bat @@ -10,7 +10,7 @@ set group_id=bif31l2uiddd4r0q6b40 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 -echo db.meta.insert({"_id":0,"meta_test":"test"}) | %mongo_exe% %database_name% || goto :error +echo db.meta.insert({"_id":"bt","meta_test":"test"}) | %mongo_exe% %database_name% || goto :error set PYTHONPATH=%1 diff --git a/tests/automatic/broker/get_meta/check_linux.sh b/tests/automatic/broker/get_meta/check_linux.sh index 100138a7a35b130877e7ce570fd7bd363e4b7c88..67186b746bdce6513e6a6c1445c4d7e523d81e07 100644 --- a/tests/automatic/broker/get_meta/check_linux.sh +++ b/tests/automatic/broker/get_meta/check_linux.sh @@ -11,7 +11,8 @@ Cleanup() { echo "db.dropDatabase()" | mongo ${database_name} } -echo 'db.meta.insert({"_id":0,"data":"test"})' | mongo ${database_name} +echo 'db.meta.insert({"_id":"bt","data":"test_bt"})' | mongo ${database_name} +echo 'db.meta.insert({"_id":"st_test","data":"test_st"})' | mongo ${database_name} token=$BT_TEST_TOKEN @@ -19,6 +20,7 @@ broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol= echo found broker at $broker -curl -v --silent $broker/v0.2/beamtime/test/detector/default/0/meta/0?token=$token --stderr - | tee /dev/stderr | grep '"data":"test"' +curl -v --silent $broker/v0.2/beamtime/test/detector/default/0/meta/0?token=$token --stderr - | tee /dev/stderr | grep '"data":"test_bt"' +curl -v --silent $broker/v0.2/beamtime/test/detector/test/0/meta/1?token=$token --stderr - | tee /dev/stderr | grep '"data":"test_st"' curl -v --silent $broker/v0.2/beamtime/test/detector/default/0/meta/1?token=$token --stderr - | tee /dev/stderr | grep 'no documents' diff --git a/tests/automatic/broker/get_meta/check_windows.bat b/tests/automatic/broker/get_meta/check_windows.bat index d9b79672ac65a61570bac60e1ade22bb3b9a8964..42287f984a8612b074225d164dbc063eee4ef592 100644 --- a/tests/automatic/broker/get_meta/check_windows.bat +++ b/tests/automatic/broker/get_meta/check_windows.bat @@ -1,7 +1,8 @@ SET database_name=data_detector SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe" -echo db.meta.insert({"_id":0}) | %mongo_exe% %database_name% || goto :error +echo db.meta.insert({"_id":"bt"}) | %mongo_exe% %database_name% || goto :error +echo db.meta.insert({"_id":"st_test"}) | %mongo_exe% %database_name% || goto :error curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3 > broker set /P broker=< broker @@ -9,7 +10,8 @@ set /P broker=< broker set token=%BT_DATA_TOKEN% -C:\Curl\curl.exe -v --silent %broker%/v0.2/beamtime/data/detector/default/0/meta/0?token=%token% --stderr - | findstr /c:\"_id\":0 || goto :error +C:\Curl\curl.exe -v --silent %broker%/v0.2/beamtime/data/detector/default/0/meta/0?token=%token% --stderr - | findstr /c:\"_id\":\"bt\" || goto :error +C:\Curl\curl.exe -v --silent %broker%/v0.2/beamtime/data/detector/test/0/meta/1?token=%token% --stderr - | findstr /c:\"_id\":\"st_test\" || goto :error C:\Curl\curl.exe -v --silent %broker%/v0.2/beamtime/data/detector/default/0/meta/1?token=%token% --stderr - | findstr /c:"no documents" || goto :error