summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2019-01-24 12:43:52 +0100
committerGitHub <noreply@github.com>2019-01-24 12:43:52 +0100
commitf0ca5920cdc001204c3728fd09cfbe68723768ae (patch)
tree57361608b5220941a7ecab381d31ba6c25046bdb /vespalib
parentfa2d390acc23a3ac2a2a3a2e1a52fadd227c95ea (diff)
parentf95540761d2b2aeefe667d3cc2127516d9c234f2 (diff)
Merge pull request #8195 from vespa-engine/vekterli/relax-client-tls-connection-stats-test-due-to-tls-13
Allow a client connection to be considered established in test [recheck merge]
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp b/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp
index f70c5670bc9..1d1520c64e0 100644
--- a/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp
+++ b/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp
@@ -632,7 +632,8 @@ TEST_F("Failure statistics are incremented on authorization failures", CertFixtu
EXPECT_EQUAL(0u, client_stats.invalid_peer_credentials);
EXPECT_EQUAL(1u, server_stats.failed_tls_handshakes);
EXPECT_EQUAL(0u, server_stats.tls_connections);
- EXPECT_EQUAL(0u, client_stats.tls_connections);
+ // Client TLS connection count may be 0 (<= v1.2) or 1 (v1.3), since v1.3
+ // completes its handshake earlier.
}
TEST_F("Success statistics are incremented on OK authorization", CertFixture) {