From cbf47ab168c28233ad9ca7a37904f840c5e81c1b Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Mon, 10 Feb 2020 13:54:58 +0100
Subject: [PATCH] fix valgrind errors
---
common/cpp/src/system_io/system_io_linux.cpp | 2 +-
consumer/api/cpp/unittests/test_server_broker.cpp | 5 +++--
deploy/build_env/manylinux2010/build_image.sh | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/common/cpp/src/system_io/system_io_linux.cpp b/common/cpp/src/system_io/system_io_linux.cpp
index f1aaec3ac..5b8c2e7d9 100644
--- a/common/cpp/src/system_io/system_io_linux.cpp
+++ b/common/cpp/src/system_io/system_io_linux.cpp
@@ -105,7 +105,7 @@ ListSocketDescriptors SystemIO::WaitSocketsActivity(SocketDescriptor master_sock
}
SystemIO::~SystemIO() {
- if (epoll_fd_ != -kDisconnectedSocketDescriptor) {
+ if (epoll_fd_ != kDisconnectedSocketDescriptor) {
close(epoll_fd_);
}
}
diff --git a/consumer/api/cpp/unittests/test_server_broker.cpp b/consumer/api/cpp/unittests/test_server_broker.cpp
index 4d9e641ad..c5c239868 100644
--- a/consumer/api/cpp/unittests/test_server_broker.cpp
+++ b/consumer/api/cpp/unittests/test_server_broker.cpp
@@ -837,6 +837,7 @@ TEST_F(ServerDataBrokerTests, QueryImagesReturnRecords) {
auto rec1 = CreateFI();
auto rec2 = CreateFI();
+ rec2.name = "ttt";
auto json1 = rec1.Json();
auto json2 = rec2.Json();
auto responce_string = "[" + json1 + "," + json2 + "]";
@@ -855,8 +856,8 @@ TEST_F(ServerDataBrokerTests, QueryImagesReturnRecords) {
ASSERT_THAT(err, Eq(nullptr));
ASSERT_THAT(images.size(), Eq(2));
- ASSERT_THAT(images[0], Eq(rec1));
- ASSERT_THAT(images[1], Eq(rec2));
+ ASSERT_THAT(images[0].name, Eq(rec1.name));
+ ASSERT_THAT(images[1].name, Eq(rec2.name));
}
TEST_F(ServerDataBrokerTests, QueryImagesUsesCorrectUriWithSubstream) {
diff --git a/deploy/build_env/manylinux2010/build_image.sh b/deploy/build_env/manylinux2010/build_image.sh
index 37ef57c7d..46679a5bc 100755
--- a/deploy/build_env/manylinux2010/build_image.sh
+++ b/deploy/build_env/manylinux2010/build_image.sh
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
docker build -t yakser/asapo-env:manylinux2010 .
-#docker push yakser/asapo-env:ubuntu16.04
+#docker push yakser/asapo-env:manylinux2010
--
GitLab