From 52e13005cf1e760fcebbd77f9b8743436622d4e4 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 5 Feb 2020 11:37:02 +0100
Subject: [PATCH] fix tests
---
consumer/api/cpp/src/server_data_broker.cpp | 2 --
consumer/api/cpp/unittests/test_server_broker.cpp | 6 +++---
tests/automatic/consumer/consumer_api_python/check_linux.sh | 4 ++--
.../full_chain/send_recv_substreams/check_windows.bat | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/consumer/api/cpp/src/server_data_broker.cpp b/consumer/api/cpp/src/server_data_broker.cpp
index 7891a5ad1..9cfbf694d 100644
--- a/consumer/api/cpp/src/server_data_broker.cpp
+++ b/consumer/api/cpp/src/server_data_broker.cpp
@@ -27,7 +27,6 @@ Error ErrorFromNoDataResponse(const std::string& response) {
if (response.find("get_record_by_id") != std::string::npos) {
ConsumerErrorData data;
auto parse_error = GetNoDataResponseFromJson(response, &data);
- std::cout<<response<<std::endl;
if (parse_error) {
return ConsumerErrorTemplates::kInterruptedTransaction.Generate("malformed response - " + response);
}
@@ -336,7 +335,6 @@ Error ServerDataBroker::SetLastReadMarker(uint64_t value, std::string group_id,
Error err;
BrokerRequestWithTimeout(ri, &err);
return err;
- asapo::Error();
}
uint64_t ServerDataBroker::GetCurrentSize(std::string substream, Error* err) {
diff --git a/consumer/api/cpp/unittests/test_server_broker.cpp b/consumer/api/cpp/unittests/test_server_broker.cpp
index 753f9c042..26db9117a 100644
--- a/consumer/api/cpp/unittests/test_server_broker.cpp
+++ b/consumer/api/cpp/unittests/test_server_broker.cpp
@@ -415,9 +415,9 @@ TEST_F(ServerDataBrokerTests, GetNextImageReturnsImmediatelyOnFinshedSubstream)
MockGetBrokerUri();
EXPECT_CALL(mock_http_client, Get_t(HasSubstr("next"), _, _)).WillOnce(DoAll(
- SetArgPointee<1>(HttpCode::Conflict),
- SetArgPointee<2>(nullptr),
- Return("{\"op\":\"get_record_by_id\",\"id\":2,\"id_max\":2,\"next_substream\":\"next\"}")));
+ SetArgPointee<1>(HttpCode::Conflict),
+ SetArgPointee<2>(nullptr),
+ Return("{\"op\":\"get_record_by_id\",\"id\":2,\"id_max\":2,\"next_substream\":\"next\"}")));
data_broker->SetTimeout(300);
auto err = data_broker->GetNext(&info, expected_group_id, nullptr);
diff --git a/tests/automatic/consumer/consumer_api_python/check_linux.sh b/tests/automatic/consumer/consumer_api_python/check_linux.sh
index 2832a9e89..8f514d075 100644
--- a/tests/automatic/consumer/consumer_api_python/check_linux.sh
+++ b/tests/automatic/consumer/consumer_api_python/check_linux.sh
@@ -28,7 +28,7 @@ echo hello1 > 1_1
for i in `seq 1 5`;
do
- echo 'db.data.insert({"_id":'$i',"size":6,"name":"'$i'","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}})' | mongo ${database_name} >/dev/null
+ echo 'db.data_default.insert({"_id":'$i',"size":6,"name":"'$i'","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}})' | mongo ${database_name} >/dev/null
done
sleep 1
@@ -51,7 +51,7 @@ do
images="$images,{"_id":$j,"size":6,"name":'${i}_${j}',"lastchange":1,"source":'none',"buf_id":0,"meta":{"test":10}}"
done
images=${images#?}
- echo 'db.data.insert({"_id":'$i',"size":3,"images":['$images']})' | mongo ${database_name} >/dev/null
+ echo 'db.data_default.insert({"_id":'$i',"size":3,"images":['$images']})' | mongo ${database_name} >/dev/null
done
diff --git a/tests/automatic/full_chain/send_recv_substreams/check_windows.bat b/tests/automatic/full_chain/send_recv_substreams/check_windows.bat
index c4c583cef..aa79cf59d 100644
--- a/tests/automatic/full_chain/send_recv_substreams/check_windows.bat
+++ b/tests/automatic/full_chain/send_recv_substreams/check_windows.bat
@@ -8,7 +8,7 @@ SET token=IEfwsWa0GXky2S3MkxJSUHJT1sI8DD5teRdjBUXVRxk=
SET beamline=test
-SET mongo_exe="c:\Program Files\MongoDB\Server\3.6\bin\mongo.exe"
+SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
c:\opt\consul\nomad run discovery.nmd
--
GitLab