Merge branch 'release/v1.1.13'

Tinkoff · Nov 17, 2021 · 6314120 · 6314120
2 parents aa9303a + e9f14a8
commit 6314120
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -30,6 +30,7 @@ jobs:
         brew install boost
         ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format"
         ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
+        brew install openssl
     # Run tests
     - name: Test
       run: .github/workflows/run.sh test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.1.13 (2021-11-17)
+
+### Bug Fixes
+
+* connector: Fix data race for random generator
+* tests/timeout: Remove time check for zero timeout
+
+### Misc
+
+* change googletest GIT_TAG to main
+* workflow: Explicitly install openssl with brew
+* readme: Add  n.suboch to maintainers list
+
+
 ## 1.1.12 (2021-09-21)
 
 ### Bug Fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 set(STREAMCLIENT_VERSION_MAJOR "1")
 set(STREAMCLIENT_VERSION_MINOR "1")
-set(STREAMCLIENT_VERSION_RELEASE "12")
+set(STREAMCLIENT_VERSION_RELEASE "13")
 set(STREAMCLIENT_SUMMARY "C++ library")
 set(STREAMCLIENT_REPOSITORY_URL "https://github.com/TinkoffCreditSystems/stream-client")
 set(STREAMCLIENT_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1 @@
+* @i-vovk @suboch
diff --git a/README.md b/README.md
@@ -231,4 +231,4 @@ Distibuted under **Apache License 2.0** [LICENSE](./LICENSE). You may also obtai
 ## Contacts
 
 Author - i.s.vovk@tinkoff.ru\
-Current maintainer - i.s.vovk@tinkoff.ru
+Current maintainers - i.s.vovk@tinkoff.ru, n.suboch@tinkoff.ru
diff --git a/include/stream-client/connector/impl/connector.ipp b/include/stream-client/connector/impl/connector.ipp
@@ -7,8 +7,8 @@ namespace {
 template <typename T>
 void shuffle_vector(std::vector<T>& v)
 {
-    static std::random_device r_device;
-    static std::mt19937 r_generator(r_device());
+    std::random_device r_device;
+    std::mt19937 r_generator(r_device());
     std::shuffle(v.begin(), v.end(), r_generator);
 }
 

diff --git a/tests/CMakeLists.txt.in b/tests/CMakeLists.txt.in
@@ -5,7 +5,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
     GIT_REPOSITORY    https://github.com/google/googletest.git
-    GIT_TAG           master
+    GIT_TAG           main
     SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
     BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
     CONFIGURE_COMMAND ""

diff --git a/tests/timeout.cpp b/tests/timeout.cpp
@@ -6,13 +6,9 @@ TYPED_TEST(ServerEnv, ConnectZeroTimeout)
     using client_type = typename TestFixture::client_type;
 
     // zero timeout should return immediately with timeout error
-    const auto start_t = std::chrono::steady_clock::now();
     ASSERT_THROW_CODE(utils::make_client<client_type>(this->server_endpoint, std::chrono::milliseconds(0),
                                                       std::chrono::seconds(0), "localhost"),
                       boost::asio::error::timed_out);
-
-    const auto elapsed = std::chrono::steady_clock::now() - start_t;
-    EXPECT_TIME_LE(elapsed, std::chrono::milliseconds(50)); // actual time differs with sanitized builds
 }
 
 TEST_F(TCPServerEnv, ConnectTimeout)