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

osxkeychain: use t.Cleanup(), and don't ignore errors

Browse Source 
Make sure we don't drop errors when cleaning up state before/after
tests.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-05-27 15:16:36 +02:00
parent a7ff1c7d16
commit 8282d3336a
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osxkeychain/osxkeychain_darwin_test.go
+30 -14
View File
@@ -82,15 +82,19 @@ func TestOSXKeychainHelperRetrieveAliases(t *testing.T) {
} }
helper := Osxkeychain{} helper := Osxkeychain{}
defer func() { t.Cleanup(func() {
for _, tc := range tests { for _, tc := range tests {
helper.Delete(tc.storeURL) if err := helper.Delete(tc.storeURL); err != nil && !credentials.IsErrCredentialsNotFound(err) {
t.Errorf("cleanup: failed to delete '%s': %v", tc.storeURL, err)
}
} }
}() })
// Clean store before testing. // Clean store before testing.
for _, tc := range tests { for _, tc := range tests {
helper.Delete(tc.storeURL) if err := helper.Delete(tc.storeURL); err != nil && !credentials.IsErrCredentialsNotFound(err) {
t.Errorf("prepare: failed to delete '%s': %v", tc.storeURL, err)
}
} }
for _, tc := range tests { for _, tc := range tests {
@@ -102,7 +106,9 @@ func TestOSXKeychainHelperRetrieveAliases(t *testing.T) {
if _, _, err := helper.Get(tc.readURL); err != nil { if _, _, err := helper.Get(tc.readURL); err != nil {
t.Errorf("Error: failed to read secret for URL %q using %q", tc.storeURL, tc.readURL) t.Errorf("Error: failed to read secret for URL %q using %q", tc.storeURL, tc.readURL)
} }
helper.Delete(tc.storeURL) if err := helper.Delete(tc.storeURL); err != nil {
t.Error(err)
}
} }
} }
@@ -149,15 +155,19 @@ func TestOSXKeychainHelperRetrieveStrict(t *testing.T) {
} }
helper := Osxkeychain{} helper := Osxkeychain{}
defer func() { t.Cleanup(func() {
for _, tc := range tests { for _, tc := range tests {
helper.Delete(tc.storeURL) if err := helper.Delete(tc.storeURL); err != nil && !credentials.IsErrCredentialsNotFound(err) {
t.Errorf("cleanup: failed to delete '%s': %v", tc.storeURL, err)
}
} }
}() })
// Clean store before testing. // Clean store before testing.
for _, tc := range tests { for _, tc := range tests {
helper.Delete(tc.storeURL) if err := helper.Delete(tc.storeURL); err != nil && !credentials.IsErrCredentialsNotFound(err) {
t.Errorf("prepare: failed to delete '%s': %v", tc.storeURL, err)
}
} }
for _, tc := range tests { for _, tc := range tests {
@@ -169,7 +179,9 @@ func TestOSXKeychainHelperRetrieveStrict(t *testing.T) {
if _, _, err := helper.Get(tc.readURL); err == nil { 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) t.Errorf("Error: managed to read secret for URL %q using %q, but should not be able to", tc.storeURL, tc.readURL)
} }
helper.Delete(tc.storeURL) if err := helper.Delete(tc.storeURL); err != nil {
t.Error(err)
}
} }
} }
@@ -190,15 +202,19 @@ func TestOSXKeychainHelperStoreRetrieve(t *testing.T) {
} }
helper := Osxkeychain{} helper := Osxkeychain{}
defer func() { t.Cleanup(func() {
for _, tc := range tests { for _, tc := range tests {
helper.Delete(tc.url) if err := helper.Delete(tc.url); err != nil && !credentials.IsErrCredentialsNotFound(err) {
t.Errorf("cleanup: failed to delete '%s': %v", tc.url, err)
}
} }
}() })
// Clean store before testing. // Clean store before testing.
for _, tc := range tests { for _, tc := range tests {
helper.Delete(tc.url) if err := helper.Delete(tc.url); err != nil && !credentials.IsErrCredentialsNotFound(err) {
t.Errorf("prepare: failed to delete '%s': %v", tc.url, err)
}
} }
// Note that we don't delete between individual tests here, to verify that // Note that we don't delete between individual tests here, to verify that