Bug 1677207 - Use GTEST_SKIP in ssl_gtests. r=bbeurdouche

Differential Revision: https://phabricator.services.mozilla.com/D98821

8 files changed, 19 insertions, 21 deletions

diff --git a/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc b/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc
index afcd7f1ce..2df0fd424 100644
--- a/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc
+++ b/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc
@@ -243,7 +243,7 @@ TEST_P(TlsCipherSuiteTest, SingleCipherSuite) {
 
 TEST_P(TlsCipherSuiteTest, ResumeCipherSuite) {
   if (SkipIfCipherSuiteIsDSA()) {
-    return;  // Tickets don't work with DSA (bug 1174677).
+    GTEST_SKIP() << "Tickets not supported with DSA (bug 1174677).";
   }
 
   SetupCertificate();  // This is only needed once.
@@ -330,7 +330,7 @@ TEST_P(TlsCipherSuiteTest, ReadLimit) {
 TEST_P(TlsCipherSuiteTest, WriteLimit) {
   // This asserts in TLS 1.3 because we expect an automatic update.
   if (version_ >= SSL_LIBRARY_VERSION_TLS_1_3) {
-    return;
+    GTEST_SKIP();
   }
   SetupCertificate();
   EnableSingleCipher();
diff --git a/gtests/ssl_gtest/ssl_debug_env_unittest.cc b/gtests/ssl_gtest/ssl_debug_env_unittest.cc
index 59ec3d393..77b4d69af 100644
--- a/gtests/ssl_gtest/ssl_debug_env_unittest.cc
+++ b/gtests/ssl_gtest/ssl_debug_env_unittest.cc
@@ -28,8 +28,7 @@ extern FILE* ssl_keylog_iob;
 TEST_P(TlsConnectGeneric, DebugEnvTraceFileNotSet) {
   char* ev = PR_GetEnvSecure("SSLDEBUGFILE");
   if (ev && ev[0]) {
-    // note: should use GTEST_SKIP when GTest gets updated to support it
-    return;
+    GTEST_SKIP();
   }
 
   Connect();
@@ -41,8 +40,7 @@ TEST_P(TlsConnectGeneric, DebugEnvTraceFileNotSet) {
 TEST_P(TlsConnectGeneric, DebugEnvKeylogFileNotSet) {
   char* ev = PR_GetEnvSecure("SSLKEYLOGFILE");
   if (ev && ev[0]) {
-    // note: should use GTEST_SKIP when GTest gets updated to support it
-    return;
+    GTEST_SKIP();
   }
 
   Connect();
diff --git a/gtests/ssl_gtest/ssl_extension_unittest.cc b/gtests/ssl_gtest/ssl_extension_unittest.cc
index da625ff72..b08eba59a 100644
--- a/gtests/ssl_gtest/ssl_extension_unittest.cc
+++ b/gtests/ssl_gtest/ssl_extension_unittest.cc
@@ -1102,7 +1102,7 @@ TEST_P(TlsExtensionTest13, HrrThenRemoveSupportedGroups) {
 TEST_P(TlsExtensionTest13, HrrThenRemoveEch) {
   if (variant_ == ssl_variant_datagram) {
     // ECH not supported in DTLS.
-    return;
+    GTEST_SKIP();
   }
 
   EnsureTlsSetup();
diff --git a/gtests/ssl_gtest/ssl_loopback_unittest.cc b/gtests/ssl_gtest/ssl_loopback_unittest.cc
index a1bc723f4..491f50921 100644
--- a/gtests/ssl_gtest/ssl_loopback_unittest.cc
+++ b/gtests/ssl_gtest/ssl_loopback_unittest.cc
@@ -390,7 +390,7 @@ TEST_P(TlsConnectDatagram, ShortRead) {
 TEST_P(TlsConnectStream, ShortRead) {
   // This test behaves oddly with TLS 1.0 because of 1/n+1 splitting,
   // so skip in that case.
-  if (version_ < SSL_LIBRARY_VERSION_TLS_1_1) return;
+  if (version_ < SSL_LIBRARY_VERSION_TLS_1_1) GTEST_SKIP();
 
   Connect();
   server_->SendData(50, 50);
diff --git a/gtests/ssl_gtest/ssl_renegotiation_unittest.cc b/gtests/ssl_gtest/ssl_renegotiation_unittest.cc
index 072a1836c..3f7074a09 100644
--- a/gtests/ssl_gtest/ssl_renegotiation_unittest.cc
+++ b/gtests/ssl_gtest/ssl_renegotiation_unittest.cc
@@ -70,7 +70,7 @@ TEST_F(TlsConnectTest, RenegotiationConfigTls13) {
 
 TEST_P(TlsConnectStream, ConnectTls10AndServerRenegotiateHigher) {
   if (version_ == SSL_LIBRARY_VERSION_TLS_1_0) {
-    return;
+    GTEST_SKIP();
   }
   // Set the client so it will accept any version from 1.0
   // to |version_|.
@@ -110,7 +110,7 @@ TEST_P(TlsConnectStream, ConnectTls10AndServerRenegotiateHigher) {
 
 TEST_P(TlsConnectStream, ConnectTls10AndClientRenegotiateHigher) {
   if (version_ == SSL_LIBRARY_VERSION_TLS_1_0) {
-    return;
+    GTEST_SKIP();
   }
   // Set the client so it will accept any version from 1.0
   // to |version_|.
@@ -148,7 +148,7 @@ TEST_P(TlsConnectStream, ConnectTls10AndClientRenegotiateHigher) {
 
 TEST_P(TlsConnectStream, ConnectAndServerRenegotiateLower) {
   if (version_ == SSL_LIBRARY_VERSION_TLS_1_0) {
-    return;
+    GTEST_SKIP();
   }
   Connect();
 
@@ -181,7 +181,7 @@ TEST_P(TlsConnectStream, ConnectAndServerRenegotiateLower) {
 
 TEST_P(TlsConnectStream, ConnectAndServerWontRenegotiateLower) {
   if (version_ == SSL_LIBRARY_VERSION_TLS_1_0) {
-    return;
+    GTEST_SKIP();
   }
   Connect();
 
@@ -200,7 +200,7 @@ TEST_P(TlsConnectStream, ConnectAndServerWontRenegotiateLower) {
 
 TEST_P(TlsConnectStream, ConnectAndClientWontRenegotiateLower) {
   if (version_ == SSL_LIBRARY_VERSION_TLS_1_0) {
-    return;
+    GTEST_SKIP();
   }
   Connect();
 
diff --git a/gtests/ssl_gtest/ssl_resumption_unittest.cc b/gtests/ssl_gtest/ssl_resumption_unittest.cc
index c41240d8e..53cddfe74 100644
--- a/gtests/ssl_gtest/ssl_resumption_unittest.cc
+++ b/gtests/ssl_gtest/ssl_resumption_unittest.cc
@@ -737,7 +737,7 @@ TEST_P(TlsConnectGenericPre13, TestResumptionOverrideVersion) {
   if (variant_ == ssl_variant_stream) {
     switch (version_) {
       case SSL_LIBRARY_VERSION_TLS_1_0:
-        return;  // Skip the test.
+        GTEST_SKIP();
       case SSL_LIBRARY_VERSION_TLS_1_1:
         override_version = SSL_LIBRARY_VERSION_TLS_1_0;
         break;
@@ -752,7 +752,7 @@ TEST_P(TlsConnectGenericPre13, TestResumptionOverrideVersion) {
       override_version = SSL_LIBRARY_VERSION_DTLS_1_0_WIRE;
     } else {
       ASSERT_EQ(SSL_LIBRARY_VERSION_TLS_1_1, version_);
-      return;  // Skip the test.
+      GTEST_SKIP();
     }
   }
 
diff --git a/gtests/ssl_gtest/ssl_version_unittest.cc b/gtests/ssl_gtest/ssl_version_unittest.cc
index c87b2117b..554e82867 100644
--- a/gtests/ssl_gtest/ssl_version_unittest.cc
+++ b/gtests/ssl_gtest/ssl_version_unittest.cc
@@ -28,7 +28,7 @@ TEST_P(TlsConnectStream, ServerNegotiateTls10) {
 }
 
 TEST_P(TlsConnectGeneric, ServerNegotiateTls11) {
-  if (version_ < SSL_LIBRARY_VERSION_TLS_1_1) return;
+  if (version_ < SSL_LIBRARY_VERSION_TLS_1_1) GTEST_SKIP();
 
   uint16_t minver, maxver;
   client_->GetVersionRange(&minver, &maxver);
@@ -39,7 +39,7 @@ TEST_P(TlsConnectGeneric, ServerNegotiateTls11) {
 }
 
 TEST_P(TlsConnectGeneric, ServerNegotiateTls12) {
-  if (version_ < SSL_LIBRARY_VERSION_TLS_1_2) return;
+  if (version_ < SSL_LIBRARY_VERSION_TLS_1_2) GTEST_SKIP();
 
   uint16_t minver, maxver;
   client_->GetVersionRange(&minver, &maxver);
@@ -129,7 +129,7 @@ TEST_P(TlsDowngradeTest, TlsDowngradeSentinelTest) {
   static const size_t kRandomLen = 32;
 
   if (c_ver > s_ver) {
-    return;
+    GTEST_SKIP();
   }
 
   client_->SetVersionRange(c_ver, c_ver);
diff --git a/gtests/ssl_gtest/tls_ech_unittest.cc b/gtests/ssl_gtest/tls_ech_unittest.cc
index 8507c5bf8..b05224bda 100644
--- a/gtests/ssl_gtest/tls_ech_unittest.cc
+++ b/gtests/ssl_gtest/tls_ech_unittest.cc
@@ -219,7 +219,7 @@ static SECStatus AuthCompleteFail(TlsAgent* agent, PRBool, PRBool) {
 
 TEST_P(TlsAgentEchTest, EchConfigsSupportedYesNo) {
   if (variant_ == ssl_variant_datagram) {
-    return;
+    GTEST_SKIP();
   }
 
   // ECHConfig 2 cipher_suites are unsupported.
@@ -244,7 +244,7 @@ TEST_P(TlsAgentEchTest, EchConfigsSupportedYesNo) {
 
 TEST_P(TlsAgentEchTest, EchConfigsSupportedNoYes) {
   if (variant_ == ssl_variant_datagram) {
-    return;
+    GTEST_SKIP();
   }
 
   // ECHConfig 1 cipher_suites are unsupported.
@@ -269,7 +269,7 @@ TEST_P(TlsAgentEchTest, EchConfigsSupportedNoYes) {
 
 TEST_P(TlsAgentEchTest, EchConfigsSupportedNoNo) {
   if (variant_ == ssl_variant_datagram) {
-    return;
+    GTEST_SKIP();
   }
 
   // ECHConfig 1 and 2 cipher_suites are unsupported.