openstack object storage acceptance tests fixes
diff --git a/acceptance/openstack/objectstorage/v1/accounts_test.go b/acceptance/openstack/objectstorage/v1/accounts_test.go
index 0cbee04..f7c01a7 100644
--- a/acceptance/openstack/objectstorage/v1/accounts_test.go
+++ b/acceptance/openstack/objectstorage/v1/accounts_test.go
@@ -16,8 +16,8 @@
client := newClient(t)
// Update an account's metadata.
- res = accounts.Update(client, accounts.UpdateOpts{Metadata: metadata})
- th.AssertNoErr(t, res.Err)
+ updateres := accounts.Update(client, accounts.UpdateOpts{Metadata: metadata})
+ th.AssertNoErr(t, updateres.Err)
// Defer the deletion of the metadata set above.
defer func() {
@@ -25,15 +25,16 @@
for k := range metadata {
tempMap[k] = ""
}
- res = accounts.Update(client, accounts.UpdateOpts{Metadata: tempMap})
- th.AssertNoErr(t, res.Err)
+ updateres = accounts.Update(client, accounts.UpdateOpts{Metadata: tempMap})
+ th.AssertNoErr(t, updateres.Err)
}()
// Retrieve account metadata.
- res := accounts.Get(client, accounts.GetOpts{})
- th.AssertNoErr(res.Err)
+ getres := accounts.Get(client, nil)
+ th.AssertNoErr(t, getres.Err)
// Extract the custom metadata from the 'Get' response.
- am := accounts.ExtractMetadata(gr)
+ am, err := getres.ExtractMetadata()
+ th.AssertNoErr(t, err)
for k := range metadata {
if am[k] != metadata[strings.Title(k)] {
t.Errorf("Expected custom metadata with key: %s", k)