From eb368c1802ac0edaf9e1e69467b0eff5ba640a9e Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Mon, 15 Jul 2019 13:32:56 +0100 Subject: [PATCH] Merge pull request #2254 from fluxcd/tests/tidy-creds-parse Run credentials tests in parallel --- registry/credentials_test.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/registry/credentials_test.go b/registry/credentials_test.go index 44c013ebc..d8473f607 100644 --- a/registry/credentials_test.go +++ b/registry/credentials_test.go @@ -4,7 +4,6 @@ import ( "encoding/base64" "fmt" "testing" - "time" "github.com/stretchr/testify/assert" ) @@ -88,19 +87,20 @@ func TestRemoteFactory_ParseHost(t *testing.T) { error: true, }, } { - stringCreds := fmt.Sprintf(tmpl, v.host, okCreds) - creds, err := ParseCredentials("test", []byte(stringCreds)) - time.Sleep(100 * time.Millisecond) - if (err != nil) != v.error { - t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil) - } - if v.error { - continue - } - actualUser := creds.credsFor(v.imagePrefix).username - assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser) - actualPass := creds.credsFor(v.imagePrefix).password - assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass) + t.Run(v.host, func(t *testing.T) { + stringCreds := fmt.Sprintf(tmpl, v.host, okCreds) + creds, err := ParseCredentials("test", []byte(stringCreds)) + if (err != nil) != v.error { + t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil) + } + if v.error { + return + } + actualUser := creds.credsFor(v.imagePrefix).username + assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser) + actualPass := creds.credsFor(v.imagePrefix).password + assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass) + }) } }