Updating account results to make them more consistent
diff --git a/openstack/objectstorage/v1/accounts/requests_test.go b/openstack/objectstorage/v1/accounts/requests_test.go
index ae9524f..8cb2be8 100644
--- a/openstack/objectstorage/v1/accounts/requests_test.go
+++ b/openstack/objectstorage/v1/accounts/requests_test.go
@@ -2,7 +2,6 @@
import (
"net/http"
- "reflect"
"testing"
"github.com/rackspace/gophercloud/testhelper"
@@ -19,13 +18,21 @@
testhelper.TestMethod(t, r, "POST")
testhelper.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
testhelper.TestHeader(t, r, "X-Account-Meta-Gophercloud-Test", "accounts")
+
+ w.Header().Set("X-Account-Container-Count", "2")
+ w.Header().Set("X-Account-Bytes-Used", "14")
+ w.Header().Set("X-Account-Meta-Subject", "books")
+
w.WriteHeader(http.StatusNoContent)
})
- err := Update(fake.ServiceClient(), UpdateOpts{Metadata: metadata})
- if err != nil {
- t.Fatalf("Unable to update account: %v", err)
- }
+ res := Update(fake.ServiceClient(), UpdateOpts{Metadata: metadata})
+
+ metadata := res.ExtractMetadata()
+ expected := map[string]string{"Subject": "books"}
+
+ testhelper.AssertDeepEquals(t, expected, metadata)
+ testhelper.AssertNoErr(t, res.Err)
}
func TestGetAccount(t *testing.T) {
@@ -35,23 +42,19 @@
testhelper.Mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
testhelper.TestMethod(t, r, "HEAD")
testhelper.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
+
+ w.Header().Set("X-Account-Container-Count", "2")
+ w.Header().Set("X-Account-Bytes-Used", "14")
+ w.Header().Set("X-Account-Meta-Subject", "books")
+
w.WriteHeader(http.StatusNoContent)
})
- _, err := Get(fake.ServiceClient(), GetOpts{})
- if err != nil {
- t.Fatalf("Unable to get account metadata: %v", err)
- }
-}
+ res := Get(fake.ServiceClient(), GetOpts{})
-func TestExtractAccountMetadata(t *testing.T) {
- getResult := &http.Response{}
+ metadata := res.ExtractMetadata()
+ expected := map[string]string{"Subject": "books"}
- expected := map[string]string{}
-
- actual := ExtractMetadata(getResult)
-
- if !reflect.DeepEqual(expected, actual) {
- t.Errorf("Expected: %+v\nActual:%+v", expected, actual)
- }
+ testhelper.AssertDeepEquals(t, expected, metadata)
+ testhelper.AssertNoErr(t, res.Err)
}