From 262e181b0eef38c6518f4bf079908200a9e1b2ae Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 18 Sep 2018 13:17:32 +0200
Subject: [PATCH] fix windows testss
---
.../full_chain/simple_chain_filegen/check_windows.bat | 8 ++++++--
.../{asapo-test.nomad => asapo-test_dummy_producer.nomad} | 0
...o-test_filegen.nomad => asapo-test_filegen_only.nomad} | 0
...ly.nomad => asapo-test_filemon_producer_tolocal.nomad} | 0
...nomad => asapo-test_filemon_producer_toreceiver.nomad} | 2 +-
5 files changed, 7 insertions(+), 3 deletions(-)
rename tests/manual/tests_via_nomad/{asapo-test.nomad => asapo-test_dummy_producer.nomad} (100%)
rename tests/manual/tests_via_nomad/{asapo-test_filegen.nomad => asapo-test_filegen_only.nomad} (100%)
rename tests/manual/tests_via_nomad/{asapo-test_produceronly.nomad => asapo-test_filemon_producer_tolocal.nomad} (100%)
rename tests/manual/tests_via_nomad/{asapo-test_filemon_producer.nomad => asapo-test_filemon_producer_toreceiver.nomad} (99%)
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 b3d1a1a8d..05c5efefe 100644
--- a/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat
@@ -1,3 +1,5 @@
+
+
SET mongo_exe="c:\Program Files\MongoDB\Server\3.6\bin\mongo.exe"
SET beamtime_id=asapo_test
SET beamline=test
@@ -23,16 +25,18 @@ c:\opt\consul\nomad run nginx.nmd
ping 1.0.0.0 -n 10 -w 100 > nul
REM producer
+mkdir %receiver_folder%
mkdir c:\tmp\asapo\test_in\test1
mkdir c:\tmp\asapo\test_in\test2
start /B "" "%1" test.json
-ping 1.0.0.0 -n 1 -w 100 > nul
+
+ping 1.0.0.0 -n 3 -w 100 > nul
echo hello > c:\tmp\asapo\test_in\test1\file1
echo hello > c:\tmp\asapo\test_in\test1\file2
echo hello > c:\tmp\asapo\test_in\test2\file2
-ping 1.0.0.0 -n 1 -w 100 > nul
+ping 1.0.0.0 -n 10 -w 100 > nul
REM worker
diff --git a/tests/manual/tests_via_nomad/asapo-test.nomad b/tests/manual/tests_via_nomad/asapo-test_dummy_producer.nomad
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test.nomad
rename to tests/manual/tests_via_nomad/asapo-test_dummy_producer.nomad
diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen.nomad b/tests/manual/tests_via_nomad/asapo-test_filegen_only.nomad
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test_filegen.nomad
rename to tests/manual/tests_via_nomad/asapo-test_filegen_only.nomad
diff --git a/tests/manual/tests_via_nomad/asapo-test_produceronly.nomad b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test_produceronly.nomad
rename to tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_producer.nomad b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
similarity index 99%
rename from tests/manual/tests_via_nomad/asapo-test_filemon_producer.nomad
rename to tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
index b10e845fb..99bb0952c 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon_producer.nomad
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
@@ -89,7 +89,7 @@ job "asapo-produceronly" {
"AsapoEndpoint":"psana002:8400",
"Tag":"test_tag",
"BeamtimeID":"asapo_test2",
- "Mode":"filesystem",
+ "Mode":"tcp",
"NThreads":1,
"LogLevel":"debug",
"RootMonitoredFolder":"/tmp/asapo/test_in",
--
GitLab