rackspace object storage acceptance tests fixes
diff --git a/acceptance/rackspace/objectstorage/v1/containers_test.go b/acceptance/rackspace/objectstorage/v1/containers_test.go
index d22057b..a7339cf 100644
--- a/acceptance/rackspace/objectstorage/v1/containers_test.go
+++ b/acceptance/rackspace/objectstorage/v1/containers_test.go
@@ -57,30 +57,28 @@
t.Errorf("No containers listed for your current token.")
}
- headers, err := raxContainers.Create(c, "gophercloud-test", nil).ExtractHeaders()
- th.AssertNoErr(t, err)
+ createres := raxContainers.Create(c, "gophercloud-test", nil)
+ th.AssertNoErr(t, createres.Err)
defer func() {
- _, err := raxContainers.Delete(c, "gophercloud-test").ExtractHeaders()
- th.AssertNoErr(t, err)
+ res := raxContainers.Delete(c, "gophercloud-test")
+ th.AssertNoErr(t, res.Err)
}()
- headers, err = raxContainers.Update(c, "gophercloud-test", raxContainers.UpdateOpts{Metadata: map[string]string{"white": "mountains"}}).ExtractHeaders()
- th.AssertNoErr(t, err)
- t.Logf("Headers from Update Account request: %+v\n", headers)
+ updateres := raxContainers.Update(c, "gophercloud-test", raxContainers.UpdateOpts{Metadata: map[string]string{"white": "mountains"}})
+ th.AssertNoErr(t, updateres.Err)
+ t.Logf("Headers from Update Account request: %+v\n", updateres.Header)
defer func() {
- _, err := raxContainers.Update(c, "gophercloud-test", raxContainers.UpdateOpts{Metadata: map[string]string{"white": ""}}).ExtractHeaders()
- th.AssertNoErr(t, err)
+ res := raxContainers.Update(c, "gophercloud-test", raxContainers.UpdateOpts{Metadata: map[string]string{"white": ""}})
+ th.AssertNoErr(t, res.Err)
metadata, err := raxContainers.Get(c, "gophercloud-test").ExtractMetadata()
th.AssertNoErr(t, err)
t.Logf("Metadata from Get Account request (after update reverted): %+v\n", metadata)
th.CheckEquals(t, metadata["White"], "")
}()
- getResult := raxContainers.Get(c, "gophercloud-test")
- headers, err = getResult.ExtractHeaders()
- th.AssertNoErr(t, err)
- t.Logf("Headers from Get Account request (after update): %+v\n", headers)
- metadata, err := getResult.ExtractMetadata()
+ getres := raxContainers.Get(c, "gophercloud-test")
+ t.Logf("Headers from Get Account request (after update): %+v\n", getres.Header)
+ metadata, err := getres.ExtractMetadata()
th.AssertNoErr(t, err)
t.Logf("Metadata from Get Account request (after update): %+v\n", metadata)
th.CheckEquals(t, metadata["White"], "mountains")