From 029e094488a8154c6bbae9cec5cbd9c69f5b3cbb Mon Sep 17 00:00:00 2001 From: avaid96 Date: Wed, 13 Jul 2016 14:36:14 -0700 Subject: [PATCH] removed a semicolon and the placeholder for the error which we used to locate it. Seems like SecItemCopyMatching is giving an error for some reason- no error on local machine Signed-off-by: avaid96 --- osxkeychain/osxkeychain_darwin.go | 1 - osxkeychain/osxkeychain_darwin_test.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/osxkeychain/osxkeychain_darwin.go b/osxkeychain/osxkeychain_darwin.go index 267142a..28c316d 100644 --- a/osxkeychain/osxkeychain_darwin.go +++ b/osxkeychain/osxkeychain_darwin.go @@ -104,7 +104,6 @@ func (h Osxkeychain) List() ([]string, []string, error) { if errMsg != nil { defer C.free(unsafe.Pointer(errMsg)) goMsg := C.GoString(errMsg) - goMsg = "Error is here" return nil, nil, errors.New(goMsg) } var listLen int diff --git a/osxkeychain/osxkeychain_darwin_test.go b/osxkeychain/osxkeychain_darwin_test.go index bfaa69c..51ae1b4 100644 --- a/osxkeychain/osxkeychain_darwin_test.go +++ b/osxkeychain/osxkeychain_darwin_test.go @@ -37,18 +37,18 @@ func TestOSXKeychainHelper(t *testing.T) { if err := helper.Delete(creds.ServerURL); err != nil { t.Fatal(err) } - helper.Add(creds); + helper.Add(creds) defer helper.Delete(creds.ServerURL) paths, accts, err := helper.List() if err != nil || len(paths) == 0 || len(accts) == 0 { t.Fatal(err) } helper.Add(creds1) + defer helper.Delete(creds1.ServerURL) newpaths, newaccts, err := helper.List() if len(newpaths)-len(paths) != 1 || len(newaccts)-len(accts) != 1 { t.Fatal(err) } - helper.Delete(creds1.ServerURL) } func TestMissingCredentials(t *testing.T) {