From 90f00e51b8de4299841ed2708bb1bb7ec260fa84 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Thu, 20 May 2021 08:52:12 +0200
Subject: [PATCH] start migration
---
tests/automatic/asapo_fabric/parallel_data_transfer.cpp | 2 +-
tests/automatic/asapo_fabric/simple_data_transfer.cpp | 2 +-
.../simple_chain_filegen_batches/check_linux.sh | 8 ++++----
.../high_avail/receiver_mongo_restart/check_linux.sh | 2 +-
tests/valgrind.suppressions | 1 -
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
index cf5e49000..ec68b712b 100644
--- a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
@@ -18,7 +18,7 @@ std::future<void> serverIsDoneFuture = serverIsDone.get_future();
constexpr size_t kRdmaSize = 5 * 1024 * 1024;
constexpr int kServerThreads = 2;
-constexpr int kEachInstanceRuns = 10;
+constexpr int kEachInstanceRuns = 3;
constexpr int kClientThreads = 4;
void ServerChildThread(FabricServer* server, std::atomic<int>* serverTotalRequests, char* expectedRdmaBuffer) {
diff --git a/tests/automatic/asapo_fabric/simple_data_transfer.cpp b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
index 28a2b9ce6..86054cb9b 100644
--- a/tests/automatic/asapo_fabric/simple_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
@@ -17,7 +17,7 @@ std::promise<void> serverIsDone;
std::future<void> serverIsDoneFuture = serverIsDone.get_future();
constexpr int kTotalRuns = 3;
-constexpr int kEachInstanceRuns = 5;
+constexpr int kEachInstanceRuns = 2;
constexpr size_t kRdmaSize = 5 * 1024 * 1024;
void ServerMasterThread(const std::string& hostname, uint16_t port, char* expectedRdmaBuffer) {
diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
index 553a3b90c..7876150ff 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
@@ -51,10 +51,6 @@ sleep 1
token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
-
-mkdir /tmp/asapo/test_in/processed/test1
-mkdir /tmp/asapo/test_in/processed/test2
-
#producer
echo "Start producer"
mkdir -p ${receiver_folder}
@@ -63,6 +59,10 @@ producerid=`echo $!`
sleep 1
+mkdir /tmp/asapo/test_in/processed/test1
+mkdir /tmp/asapo/test_in/processed/test2
+
+
echo hello > /tmp/asapo/test_in/processed/test1/file1
echo hello > /tmp/asapo/test_in/processed/test1/file2
echo hello > /tmp/asapo/test_in/processed/test2/file1
diff --git a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
index 11199a46a..d56abbb21 100644
--- a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
+++ b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
@@ -83,7 +83,7 @@ start_mongo
wait
-echo "db.data_default.validate(true)" | mongo --port 27016 ${beamtime_id}_detector
+echo "db.data_default.validate({full: true})" | mongo --port 27016 ${beamtime_id}_detector
echo processed files:
echo "db.data_default.count()" | mongo --port 27016 ${beamtime_id}_detector
diff --git a/tests/valgrind.suppressions b/tests/valgrind.suppressions
index 2c21d104a..5df24de1c 100644
--- a/tests/valgrind.suppressions
+++ b/tests/valgrind.suppressions
@@ -95,7 +95,6 @@
Memcheck:Param
socketcall.sendto(msg)
fun:send
- fun:ofi_send_socket
}
{
asapo_fabric__sockets__leak
--
GitLab