tests: resolve oidc conformity regression

ory · Mar 23, 2021 · 1049602 · 1049602
1 parent 7f806e5
commit 1049602
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -78,7 +78,7 @@ jobs:
           - POSTGRES_USER=test
           - POSTGRES_PASSWORD=test
           - POSTGRES_DB=postgres
-      - image: cockroachdb/cockroach:v20.2.5
+      - image: cockroachdb/cockroach:v20.2.6
         command: start-single-node --insecure
       - image: mysql:8.0
         environment:

diff --git a/test/conformance/run_test.go b/test/conformance/run_test.go
@@ -4,7 +4,6 @@ package main
 
 import (
 	"bytes"
-	"crypto/tls"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -105,13 +104,7 @@ var (
 	}
 	server     = urlx.ParseOrPanic("https://127.0.0.1:8443")
 	config, _  = ioutil.ReadFile("./config.json")
-	httpClient = &http.Client{
-		Transport: httpx.NewResilientRoundTripper(&http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-		}, time.Second*5, time.Second*15),
-	}
+	httpClient = httpx.NewResilientClient(httpx.ResilientClientWithMinxRetryWait(time.Second*5), httpx.ResilientClientWithClient(&http.Client{Timeout: time.Second * 5}))
 
 	workdir string
 
@@ -269,7 +262,7 @@ func createPlan(t *testing.T, extra url.Values, isParallel bool) {
 								bo := conf.NextBackOff()
 								require.NotEqual(t, backoff.Stop, bo, "%+v", err)
 
-								_, err = hydra.Admin.CreateJSONWebKeySet(admin.NewCreateJSONWebKeySetParams().WithHTTPClient(httpClient).WithSet("hydra.openid.id-token").WithBody(&models.JSONWebKeySetGeneratorRequest{
+								_, err = hydra.Admin.CreateJSONWebKeySet(admin.NewCreateJSONWebKeySetParams().WithHTTPClient(httpClient.StandardClient()).WithSet("hydra.openid.id-token").WithBody(&models.JSONWebKeySetGeneratorRequest{
 									Alg: pointerx.String("RS256"),
 								}))
 								if err == nil {