From a79318d70aaeeabb06dda8922789ed1741201265 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Thu, 24 Sep 2020 15:00:55 +0200
Subject: [PATCH] fix linux tests
---
examples/producer/dummy-data-producer/dummy_data_producer.cpp | 4 ++--
tests/automatic/full_chain/simple_chain_raw/check_linux.sh | 2 +-
tests/automatic/full_chain/simple_chain_raw/check_windows.bat | 2 +-
.../producer_receiver/transfer_datasets/check_linux.sh | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/producer/dummy-data-producer/dummy_data_producer.cpp b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
index 2b2294102..24721ae21 100644
--- a/examples/producer/dummy-data-producer/dummy_data_producer.cpp
+++ b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
@@ -36,7 +36,7 @@ void PrintCommandArguments(const Args& args) {
<< "nthreads: " << args.nthreads << std::endl
<< "mode: " << args.mode << std::endl
<< "Write files: " << ((args.mode %100) / 10 == 1) << std::endl
- << "Tcp mode: " << ((args.mode % 10)==0) << std::endl
+ << "Tcp mode: " << ((args.mode % 10) ==0 ) << std::endl
<< "Raw: " << (args.mode / 100 == 1)<< std::endl
<< "timeout: " << args.timeout_sec << std::endl
<< "images in set: " << args.images_in_set << std::endl
@@ -224,7 +224,7 @@ int main (int argc, char* argv[]) {
system_clock::time_point start_time = system_clock::now();
if(!SendDummyData(producer.get(), args.number_of_bytes, args.iterations, args.images_in_set, args.stream,
- (args.mode %100) / 10 == 1,args.mode / 100 == 0 ?asapo::SourceType::kProcessed:asapo::SourceType::kRaw)) {
+ (args.mode %100) / 10 == 0,args.mode / 100 == 0 ?asapo::SourceType::kProcessed:asapo::SourceType::kRaw)) {
return EXIT_FAILURE;
}
diff --git a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh b/tests/automatic/full_chain/simple_chain_raw/check_linux.sh
index 56dbbd421..5380de346 100644
--- a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_raw/check_linux.sh
@@ -41,7 +41,7 @@ nomad run broker.nmd
sleep 1
#producer
-$1 localhost:8400 ${beamtime_id} 100 10 4 110 100
+$1 localhost:8400 ${beamtime_id} 100 10 4 100 100
$2 ${proxy_address} "__" ${beamtime_id} 2 $token 5000 1 > out
diff --git a/tests/automatic/full_chain/simple_chain_raw/check_windows.bat b/tests/automatic/full_chain/simple_chain_raw/check_windows.bat
index 280f19efa..aaa10a220 100644
--- a/tests/automatic/full_chain/simple_chain_raw/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_raw/check_windows.bat
@@ -16,7 +16,7 @@ call start_services.bat
REM producer
mkdir %receiver_folder%
-start /B "" "%1" %proxy_address% %beamtime_id% 100 10 4 110 100
+start /B "" "%1" %proxy_address% %beamtime_id% 100 10 4 100 100
ping 1.0.0.0 -n 1 -w 100 > nul
REM consumer
diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
index 760641d80..ad1f5f6aa 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
@@ -38,7 +38,7 @@ nomad run discovery.nmd
mkdir -p ${receiver_folder}
-$1 localhost:8400 ${beamtime_id} 100 1 1 0 30 3
+$1 localhost:8400 ${beamtime_id} 100 1 1 0 30 3
ls -ln ${receiver_folder}/processed/1_1 | awk '{ print $5 }'| grep 100000
ls -ln ${receiver_folder}/processed/1_2 | awk '{ print $5 }'| grep 100000
--
GitLab