From 893221ad90f0964248aa11fe269dd847fb73f667 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Mon, 6 Apr 2020 17:59:40 +0200
Subject: [PATCH] fix tests
---
deploy/asapo_helm_chart/asapo/templates/roles.yaml | 0
.../next_multithread_broker/next_multithread_broker.cpp | 4 +++-
.../full_chain/simple_chain_metadata/check_windows.bat | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 deploy/asapo_helm_chart/asapo/templates/roles.yaml
diff --git a/deploy/asapo_helm_chart/asapo/templates/roles.yaml b/deploy/asapo_helm_chart/asapo/templates/roles.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp b/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp
index df24e18c1..4c4b572d1 100644
--- a/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp
+++ b/tests/automatic/consumer/next_multithread_broker/next_multithread_broker.cpp
@@ -64,7 +64,9 @@ void TestAll(const Args& args) {
}
for (auto& thread : threads) {
- thread.join();
+ if (thread.joinable()) {
+ thread.join();
+ }
}
Assert(file_infos, args.nthreads, args.nfiles);
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 7dc9d9a93..2d4e98f79 100644
--- a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
@@ -22,7 +22,7 @@ ping 1.0.0.0 -n 10 -w 100 > nul
REM producer
mkdir %receiver_folder%
-"%1" %proxy_address% %beamtime_id% 100 0 1 0 100
+"%1" %proxy_address% %beamtime_id% 100 0 1 0 10000
REM consumer
"%2" %proxy_address% %receiver_folder% %beamtime_id% 2 %token% 0 1 > out.txt
--
GitLab