Update oidc_test.go

Signed-off-by: Matthieu MOREL <[email protected]>
argoproj · Dec 19, 2024 · 5b25e91 · 5b25e91
1 parent 182fbb6
commit 5b25e91
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/util/oidc/oidc_test.go b/util/oidc/oidc_test.go
@@ -136,8 +136,9 @@ requestedScopes: ["oidc"]`, oidcTestServer.URL),
 
 		app.HandleLogin(w, req)
 
-		require.Containsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error")
-		require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		if assert.NotContainsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error") {
+			require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		}
 
 		cdSettings.OIDCTLSInsecureSkipVerify = true
 
@@ -175,8 +176,9 @@ requestedScopes: ["oidc"]`, oidcTestServer.URL),
 
 		app.HandleLogin(w, req)
 
-		require.Containsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error")
-		require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		if assert.NotContainsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error") {
+			require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		}
 
 		app, err = NewClientApp(cdSettings, dexTestServer.URL, &dex.DexTLSConfig{StrictValidation: false}, "https://argocd.example.com", cache.NewInMemoryCache(24*time.Hour))
 		require.NoError(t, err)
@@ -360,8 +362,9 @@ requestedScopes: ["oidc"]`, oidcTestServer.URL),
 
 		app.HandleCallback(w, req)
 
-		require.Containsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error")
-		require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		if assert.NotContainsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error") {
+			require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		}
 
 		cdSettings.OIDCTLSInsecureSkipVerify = true
 
@@ -399,8 +402,9 @@ requestedScopes: ["oidc"]`, oidcTestServer.URL),
 
 		app.HandleCallback(w, req)
 
-		require.Containsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error")
-		require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		if assert.NotContainsf(t, w.Body.String(), "certificate signed by unknown authority", "did not receive expected certificate verification failure error") {
+			require.Containsf(t, w.Body.String(), "certificate is not trusted", "did not receive expected certificate verification failure error")
+		}
 
 		app, err = NewClientApp(cdSettings, dexTestServer.URL, &dex.DexTLSConfig{StrictValidation: false}, "https://argocd.example.com", cache.NewInMemoryCache(24*time.Hour))
 		require.NoError(t, err)