Browse Source

tests/e2e: handle cipher suite mismatch error in ubuntu

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
6a16c7974a
1 changed files with 13 additions and 6 deletions
  1. 13 6
      tests/e2e/v3_cipher_suite_test.go

+ 13 - 6
tests/e2e/v3_cipher_suite_test.go

@@ -55,12 +55,19 @@ func cipherSuiteTestValid(cx ctlCtx) {
 }
 }
 
 
 func cipherSuiteTestMismatch(cx ctlCtx) {
 func cipherSuiteTestMismatch(cx ctlCtx) {
-	if err := cURLGet(cx.epc, cURLReq{
-		endpoint:         "/metrics",
-		expected:         "alert handshake failure",
-		metricsURLScheme: cx.cfg.metricsURLScheme,
-		ciphers:          "ECDHE-RSA-DES-CBC3-SHA", // TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
-	}); err != nil {
+	var err error
+	for _, exp := range []string{"alert handshake failure", "failed setting cipher list"} {
+		err = cURLGet(cx.epc, cURLReq{
+			endpoint:         "/metrics",
+			expected:         exp,
+			metricsURLScheme: cx.cfg.metricsURLScheme,
+			ciphers:          "ECDHE-RSA-DES-CBC3-SHA", // TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+		})
+		if err == nil {
+			break
+		}
+	}
+	if err != nil {
 		cx.t.Fatalf("failed get with curl (%v)", err)
 		cx.t.Fatalf("failed get with curl (%v)", err)
 	}
 	}
 }
 }