diff --git a/client/client_test.go b/client/client_test.go index e5f1bf2..c1665c4 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -106,8 +106,8 @@ func ExampleStore() { func TestStore(t *testing.T) { valid := []credentials.Credentials{ - {validServerAddress, "foo", "bar"}, - {validServerAddress2, "", "abcd1234"}, + {credentials.CredsLabel, validServerAddress, "foo", "bar"}, + {credentials.CredsLabel, validServerAddress2, "", "abcd1234"}, } for _, v := range valid { @@ -117,7 +117,7 @@ func TestStore(t *testing.T) { } invalid := []credentials.Credentials{ - {invalidServerAddress, "foo", "bar"}, + {credentials.CredsLabel, invalidServerAddress, "foo", "bar"}, } for _, v := range invalid { @@ -140,8 +140,8 @@ func ExampleGet() { func TestGet(t *testing.T) { valid := []credentials.Credentials{ - {validServerAddress, "foo", "bar"}, - {validServerAddress2, "", "abcd1234"}, + {credentials.CredsLabel, validServerAddress, "foo", "bar"}, + {credentials.CredsLabel, validServerAddress2, "", "abcd1234"}, } for _, v := range valid { diff --git a/osxkeychain/osxkeychain_darwin.h b/osxkeychain/osxkeychain_darwin.h index a368046..c54e7d7 100644 --- a/osxkeychain/osxkeychain_darwin.h +++ b/osxkeychain/osxkeychain_darwin.h @@ -10,5 +10,5 @@ struct Server { char *keychain_add(struct Server *server, char *label, char *username, char *secret); char *keychain_get(struct Server *server, unsigned int *username_l, char **username, unsigned int *secret_l, char **secret); char *keychain_delete(struct Server *server); -char *keychain_list(char *** data, char *** accts, unsigned int *list_l); +char *keychain_list(char *credsLabel, char *** data, char *** accts, unsigned int *list_l); void freeListData(char *** data, unsigned int length); \ No newline at end of file diff --git a/osxkeychain/osxkeychain_darwin_test.go b/osxkeychain/osxkeychain_darwin_test.go index 700f153..bbfe1ff 100644 --- a/osxkeychain/osxkeychain_darwin_test.go +++ b/osxkeychain/osxkeychain_darwin_test.go @@ -7,11 +7,13 @@ import ( func TestOSXKeychainHelper(t *testing.T) { creds := &credentials.Credentials{ + Label: credentials.CredsLabel, ServerURL: "https://foobar.docker.io:2376/v1", Username: "foobar", Secret: "foobarbaz", } creds1 := &credentials.Credentials{ + Label: credentials.CredsLabel, ServerURL: "https://foobar.docker.io:2376/v2", Username: "foobarbaz", Secret: "foobar", diff --git a/secretservice/secretservice_linux_test.go b/secretservice/secretservice_linux_test.go index f5ba9df..057efca 100644 --- a/secretservice/secretservice_linux_test.go +++ b/secretservice/secretservice_linux_test.go @@ -10,10 +10,10 @@ func TestSecretServiceHelper(t *testing.T) { t.Skip("test requires gnome-keyring but travis CI doesn't have it") creds := &credentials.Credentials{ + Label: credentials.CredsLabel, ServerURL: "https://foobar.docker.io:2376/v1", Username: "foobar", Secret: "foobarbaz", - Label: credentials.CredsLabel, } helper := Secretservice{}