1
0
mirror of https://github.com/docker/docker-credential-helpers.git synced 2026-06-13 16:01:28 +05:30

osxkeychain: use sub-tests

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-05-27 15:38:04 +02:00
parent 8282d3336a
commit 5c5b09e7f8
+13 -8
View File
@@ -98,10 +98,11 @@ func TestOSXKeychainHelperRetrieveAliases(t *testing.T) {
}
for _, tc := range tests {
tc := tc
t.Run(tc.doc, func(t *testing.T) {
c := &credentials.Credentials{ServerURL: tc.storeURL, Username: "hello", Secret: "world"}
if err := helper.Add(c); err != nil {
t.Errorf("Error: failed to store secret for URL %q: %s", tc.storeURL, err)
continue
t.Fatalf("Error: failed to store secret for URL %q: %s", tc.storeURL, err)
}
if _, _, err := helper.Get(tc.readURL); err != nil {
t.Errorf("Error: failed to read secret for URL %q using %q", tc.storeURL, tc.readURL)
@@ -109,6 +110,7 @@ func TestOSXKeychainHelperRetrieveAliases(t *testing.T) {
if err := helper.Delete(tc.storeURL); err != nil {
t.Error(err)
}
})
}
}
@@ -171,10 +173,11 @@ func TestOSXKeychainHelperRetrieveStrict(t *testing.T) {
}
for _, tc := range tests {
tc := tc
t.Run(tc.doc, func(t *testing.T) {
c := &credentials.Credentials{ServerURL: tc.storeURL, Username: "hello", Secret: "world"}
if err := helper.Add(c); err != nil {
t.Errorf("Error: failed to store secret for URL %q: %s", tc.storeURL, err)
continue
t.Fatalf("Error: failed to store secret for URL %q: %s", tc.storeURL, err)
}
if _, _, err := helper.Get(tc.readURL); err == nil {
t.Errorf("Error: managed to read secret for URL %q using %q, but should not be able to", tc.storeURL, tc.readURL)
@@ -182,6 +185,7 @@ func TestOSXKeychainHelperRetrieveStrict(t *testing.T) {
if err := helper.Delete(tc.storeURL); err != nil {
t.Error(err)
}
})
}
}
@@ -220,6 +224,8 @@ func TestOSXKeychainHelperStoreRetrieve(t *testing.T) {
// Note that we don't delete between individual tests here, to verify that
// subsequent stores/overwrites don't affect storing / retrieving secrets.
for i, tc := range tests {
tc := tc
t.Run(tc.url, func(t *testing.T) {
c := &credentials.Credentials{
ServerURL: tc.url,
Username: fmt.Sprintf("user-%d", i),
@@ -227,13 +233,11 @@ func TestOSXKeychainHelperStoreRetrieve(t *testing.T) {
}
if err := helper.Add(c); err != nil {
t.Errorf("Error: failed to store secret for URL: %s: %s", tc.url, err)
continue
t.Fatalf("Error: failed to store secret for URL: %s: %s", tc.url, err)
}
user, secret, err := helper.Get(tc.url)
if err != nil {
t.Errorf("Error: failed to read secret for URL %q: %s", tc.url, err)
continue
t.Fatalf("Error: failed to read secret for URL %q: %s", tc.url, err)
}
if user != c.Username {
t.Errorf("Error: expected username %s, got username %s for URL: %s", c.Username, user, tc.url)
@@ -241,6 +245,7 @@ func TestOSXKeychainHelperStoreRetrieve(t *testing.T) {
if secret != c.Secret {
t.Errorf("Error: expected secret %s, got secret %s for URL: %s", c.Secret, secret, tc.url)
}
})
}
}