From a8e7e23383c28d1230e2970c17753453fb259360 Mon Sep 17 00:00:00 2001 From: Sergey Yakubov <sergey.yakubov@desy.de> Date: Fri, 1 Jun 2018 18:23:42 +0200 Subject: [PATCH] correct windows tests --- examples/worker/getnext_broker/check_windows.bat | 2 +- examples/worker/process_folder/check_windows.bat | 2 +- tests/automatic/broker/get_next/check_windows.bat | 6 +++--- tests/automatic/full_chain/simple_chain/check_windows.bat | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/worker/getnext_broker/check_windows.bat b/examples/worker/getnext_broker/check_windows.bat index cdbb25977..f176ca87a 100644 --- a/examples/worker/getnext_broker/check_windows.bat +++ b/examples/worker/getnext_broker/check_windows.bat @@ -14,7 +14,7 @@ ping 1.0.0.0 -n 1 -w 100 > nul for /l %%x in (1, 1, 3) do echo db.data.insert({"_id":%%x,"size":100,"name":"%%x","lastchange":1}) | %mongo_exe% %database_name% || goto :error -"%1" 127.0.0.1:5005 %database_name% 1 | findstr "Processed 3 file" || goto :error +"%1" 127.0.0.1:5005 %database_name% 1 | findstr /c:"Processed 3 file" || goto :error goto :clean :error diff --git a/examples/worker/process_folder/check_windows.bat b/examples/worker/process_folder/check_windows.bat index f03ab5c70..27e5525f9 100644 --- a/examples/worker/process_folder/check_windows.bat +++ b/examples/worker/process_folder/check_windows.bat @@ -1,6 +1,6 @@ mkdir test echo "" > test/1 -.\worker_processfolder test | findstr "Processed 1 file(s)" +.\worker_processfolder test | findstr /c:"Processed 1 file(s)" rmdir /S /Q test diff --git a/tests/automatic/broker/get_next/check_windows.bat b/tests/automatic/broker/get_next/check_windows.bat index 026563bea..ac3299335 100644 --- a/tests/automatic/broker/get_next/check_windows.bat +++ b/tests/automatic/broker/get_next/check_windows.bat @@ -11,9 +11,9 @@ start /B "" "%full_name%" -config settings.json ping 1.0.0.0 -n 1 -w 100 > nul -C:\Curl\curl.exe -v --silent 127.0.0.1:5005/database/data/next --stderr - | findstr \"_id\":1 || goto :error -C:\Curl\curl.exe -v --silent 127.0.0.1:5005/database/data/next --stderr - | findstr \"_id\":2 || goto :error -C:\Curl\curl.exe -v --silent 127.0.0.1:5005/database/data/next --stderr - | findstr "Not Found" || goto :error +C:\Curl\curl.exe -v --silent 127.0.0.1:5005/database/data/next --stderr - | findstr /c:\"_id\":1 || goto :error +C:\Curl\curl.exe -v --silent 127.0.0.1:5005/database/data/next --stderr - | findstr /c:\"_id\":2 || goto :error +C:\Curl\curl.exe -v --silent 127.0.0.1:5005/database/data/next --stderr - | findstr /c:"Not Found" || goto :error goto :clean diff --git a/tests/automatic/full_chain/simple_chain/check_windows.bat b/tests/automatic/full_chain/simple_chain/check_windows.bat index e8d63bbe8..f2b98f2ce 100644 --- a/tests/automatic/full_chain/simple_chain/check_windows.bat +++ b/tests/automatic/full_chain/simple_chain/check_windows.bat @@ -18,7 +18,7 @@ ping 1.0.0.0 -n 1 -w 100 > nul REM worker set broker_address="127.0.0.1:5005" -"%2" %broker_address% %broker_database_name% 2 | findstr "Processed 1000 file(s)" || goto :error +"%2" %broker_address% %broker_database_name% 2 | findstr /c:"Processed 1000 file(s)" || goto :error goto :clean -- GitLab