Skip to content

Commit 6314120

Browse files
committed
Merge branch 'release/v1.1.13'
2 parents aa9303a + e9f14a8 commit 6314120

File tree

8 files changed

+21
-9
lines changed

8 files changed

+21
-9
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
brew install boost
3131
ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format"
3232
ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
33+
brew install openssl
3334
# Run tests
3435
- name: Test
3536
run: .github/workflows/run.sh test

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 1.1.13 (2021-11-17)
2+
3+
### Bug Fixes
4+
5+
* connector: Fix data race for random generator
6+
* tests/timeout: Remove time check for zero timeout
7+
8+
### Misc
9+
10+
* change googletest GIT_TAG to main
11+
* workflow: Explicitly install openssl with brew
12+
* readme: Add n.suboch to maintainers list
13+
14+
115
## 1.1.12 (2021-09-21)
216

317
### Bug Fixes

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
22

33
set(STREAMCLIENT_VERSION_MAJOR "1")
44
set(STREAMCLIENT_VERSION_MINOR "1")
5-
set(STREAMCLIENT_VERSION_RELEASE "12")
5+
set(STREAMCLIENT_VERSION_RELEASE "13")
66
set(STREAMCLIENT_SUMMARY "C++ library")
77
set(STREAMCLIENT_REPOSITORY_URL "https://github.com/TinkoffCreditSystems/stream-client")
88
set(STREAMCLIENT_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @i-vovk @suboch

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,4 @@ Distibuted under **Apache License 2.0** [LICENSE](./LICENSE). You may also obtai
231231
## Contacts
232232

233233
Author - i.s.vovk@tinkoff.ru\
234-
Current maintainer - i.s.vovk@tinkoff.ru
234+
Current maintainers - i.s.vovk@tinkoff.ru, n.suboch@tinkoff.ru

include/stream-client/connector/impl/connector.ipp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ namespace {
77
template <typename T>
88
void shuffle_vector(std::vector<T>& v)
99
{
10-
static std::random_device r_device;
11-
static std::mt19937 r_generator(r_device());
10+
std::random_device r_device;
11+
std::mt19937 r_generator(r_device());
1212
std::shuffle(v.begin(), v.end(), r_generator);
1313
}
1414

tests/CMakeLists.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project(googletest-download NONE)
55
include(ExternalProject)
66
ExternalProject_Add(googletest
77
GIT_REPOSITORY https://github.com/google/googletest.git
8-
GIT_TAG master
8+
GIT_TAG main
99
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
1010
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
1111
CONFIGURE_COMMAND ""

tests/timeout.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ TYPED_TEST(ServerEnv, ConnectZeroTimeout)
66
using client_type = typename TestFixture::client_type;
77

88
// zero timeout should return immediately with timeout error
9-
const auto start_t = std::chrono::steady_clock::now();
109
ASSERT_THROW_CODE(utils::make_client<client_type>(this->server_endpoint, std::chrono::milliseconds(0),
1110
std::chrono::seconds(0), "localhost"),
1211
boost::asio::error::timed_out);
13-
14-
const auto elapsed = std::chrono::steady_clock::now() - start_t;
15-
EXPECT_TIME_LE(elapsed, std::chrono::milliseconds(50)); // actual time differs with sanitized builds
1612
}
1713

1814
TEST_F(TCPServerEnv, ConnectTimeout)

0 commit comments

Comments
 (0)