From 5881a2cfcad79a7d741f72cacad830b90679cb22 Mon Sep 17 00:00:00 2001 From: Andrew Block Date: Sun, 22 Dec 2019 00:02:08 -0500 Subject: [PATCH] Test cleanup --- connector/openshift/openshift_test.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/connector/openshift/openshift_test.go b/connector/openshift/openshift_test.go index a4a5c27a..a44e5f21 100644 --- a/connector/openshift/openshift_test.go +++ b/connector/openshift/openshift_test.go @@ -2,7 +2,6 @@ package openshift import ( "context" - "crypto/tls" "encoding/json" "fmt" "net/http" @@ -19,7 +18,6 @@ import ( ) func TestOpen(t *testing.T) { - s := newTestServer(map[string]interface{}{}) defer s.Close() @@ -180,7 +178,7 @@ func newTestServer(responses map[string]interface{}) *httptest.Server { s = httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { responses["/.well-known/oauth-authorization-server"] = map[string]interface{}{ - "issuer": fmt.Sprintf("%s", s.URL), + "issuer": s.URL, "authorization_endpoint": fmt.Sprintf("%s/oauth/authorize", s.URL), "token_endpoint": fmt.Sprintf("%s/oauth/token", s.URL), "scopes_supported": []string{"user:full", "user:info", "user:check-access", "user:list-scoped-projects", "user:list-projects"}, @@ -197,25 +195,12 @@ func newTestServer(responses map[string]interface{}) *httptest.Server { return s } -func newClient() *http.Client { - tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, - } - return &http.Client{Transport: tr} -} - func expectNil(t *testing.T, a interface{}) { if a != nil { t.Errorf("Expected %+v to equal nil", a) } } -func expectNotNil(t *testing.T, a interface{}, msg string) { - if a == nil { - t.Errorf("Expected %+v to not to be nil", msg) - } -} - func expectEquals(t *testing.T, a interface{}, b interface{}) { if !reflect.DeepEqual(a, b) { t.Errorf("Expected %+v to equal %+v", a, b)