Skip to content

Commit 887a664

Browse files
committed
I think OSX tests were failing because it was a list against an empty keychain, checking whether that is the case by filling it first
Signed-off-by: avaid96 <[email protected]>
1 parent d2e6ed7 commit 887a664

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

osxkeychain/osxkeychain_darwin.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ func (h Osxkeychain) List() ([]string, []string, error) {
104104
if errMsg != nil {
105105
defer C.free(unsafe.Pointer(errMsg))
106106
goMsg := C.GoString(errMsg)
107+
goMsg = "Error is here"
107108
return nil, nil, errors.New(goMsg)
108109
}
109110
var listLen int

osxkeychain/osxkeychain_darwin_test.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ func TestOSXKeychainHelper(t *testing.T) {
1111
Username: "foobar",
1212
Secret: "foobarbaz",
1313
}
14-
14+
creds1 := &credentials.Credentials{
15+
ServerURL: "https://foobar.docker.io:2376/v2",
16+
Username: "foobarbaz",
17+
Secret: "foobar",
18+
}
1519
helper := Osxkeychain{}
1620
if err := helper.Add(creds); err != nil {
1721
t.Fatal(err)
@@ -33,17 +37,18 @@ func TestOSXKeychainHelper(t *testing.T) {
3337
if err := helper.Delete(creds.ServerURL); err != nil {
3438
t.Fatal(err)
3539
}
36-
40+
helper.Add(creds);
41+
defer helper.Delete(creds.ServerURL)
3742
paths, accts, err := helper.List()
3843
if err != nil || len(paths) == 0 || len(accts) == 0 {
3944
t.Fatal(err)
4045
}
41-
helper.Add(creds)
46+
helper.Add(creds1)
4247
newpaths, newaccts, err := helper.List()
4348
if len(newpaths)-len(paths) != 1 || len(newaccts)-len(accts) != 1 {
4449
t.Fatal(err)
4550
}
46-
helper.Delete(creds.ServerURL)
51+
helper.Delete(creds1.ServerURL)
4752
}
4853

4954
func TestMissingCredentials(t *testing.T) {

0 commit comments

Comments
 (0)