rax bulk operations; results update [not working]
diff --git a/openstack/objectstorage/v1/containers/requests_test.go b/openstack/objectstorage/v1/containers/requests_test.go
index 4420aa0..d0ce7f1 100644
--- a/openstack/objectstorage/v1/containers/requests_test.go
+++ b/openstack/objectstorage/v1/containers/requests_test.go
@@ -57,9 +57,9 @@
HandleCreateContainerSuccessfully(t)
options := CreateOpts{ContentType: "application/json", Metadata: map[string]string{"foo": "bar"}}
- headers, err := Create(fake.ServiceClient(), "testContainer", options).ExtractHeaders()
- th.CheckNoErr(t, err)
- th.CheckEquals(t, "bar", headers["X-Container-Meta-Foo"][0])
+ res := Create(fake.ServiceClient(), "testContainer", options)
+ th.CheckNoErr(t, res.Err)
+ th.CheckEquals(t, "bar", res.Header["X-Container-Meta-Foo"][0])
}
func TestDeleteContainer(t *testing.T) {
@@ -67,8 +67,8 @@
defer th.TeardownHTTP()
HandleDeleteContainerSuccessfully(t)
- _, err := Delete(fake.ServiceClient(), "testContainer").ExtractHeaders()
- th.CheckNoErr(t, err)
+ res := Delete(fake.ServiceClient(), "testContainer")
+ th.CheckNoErr(t, res.Err)
}
func TestUpateContainer(t *testing.T) {
@@ -77,8 +77,8 @@
HandleUpdateContainerSuccessfully(t)
options := &UpdateOpts{Metadata: map[string]string{"foo": "bar"}}
- _, err := Update(fake.ServiceClient(), "testContainer", options).ExtractHeaders()
- th.CheckNoErr(t, err)
+ res := Update(fake.ServiceClient(), "testContainer", options)
+ th.CheckNoErr(t, res.Err)
}
func TestGetContainer(t *testing.T) {
diff --git a/openstack/objectstorage/v1/objects/requests_test.go b/openstack/objectstorage/v1/objects/requests_test.go
index 232e626..7ab40f2 100644
--- a/openstack/objectstorage/v1/objects/requests_test.go
+++ b/openstack/objectstorage/v1/objects/requests_test.go
@@ -69,8 +69,8 @@
content := bytes.NewBufferString("Did gyre and gimble in the wabe")
options := &CreateOpts{ContentType: "application/json"}
- _, err := Create(fake.ServiceClient(), "testContainer", "testObject", content, options).ExtractHeaders()
- th.AssertNoErr(t, err)
+ res := Create(fake.ServiceClient(), "testContainer", "testObject", content, options)
+ th.AssertNoErr(t, res.Err)
}
func TestCopyObject(t *testing.T) {
@@ -79,8 +79,8 @@
HandleCopyObjectSuccessfully(t)
options := &CopyOpts{Destination: "/newTestContainer/newTestObject"}
- _, err := Copy(fake.ServiceClient(), "testContainer", "testObject", options).ExtractHeaders()
- th.AssertNoErr(t, err)
+ res := Copy(fake.ServiceClient(), "testContainer", "testObject", options)
+ th.AssertNoErr(t, res.Err)
}
func TestDeleteObject(t *testing.T) {
@@ -88,8 +88,8 @@
defer th.TeardownHTTP()
HandleDeleteObjectSuccessfully(t)
- _, err := Delete(fake.ServiceClient(), "testContainer", "testObject", nil).ExtractHeaders()
- th.AssertNoErr(t, err)
+ res := Delete(fake.ServiceClient(), "testContainer", "testObject", nil)
+ th.AssertNoErr(t, res.Err)
}
func TestUpateObjectMetadata(t *testing.T) {
@@ -98,8 +98,8 @@
HandleUpdateObjectSuccessfully(t)
options := &UpdateOpts{Metadata: map[string]string{"Gophercloud-Test": "objects"}}
- _, err := Update(fake.ServiceClient(), "testContainer", "testObject", options).ExtractHeaders()
- th.AssertNoErr(t, err)
+ res := Update(fake.ServiceClient(), "testContainer", "testObject", options)
+ th.AssertNoErr(t, res.Err)
}
func TestGetObject(t *testing.T) {