Updating acceptance tests :ok_hand:
diff --git a/acceptance/openstack/blockstorage/v1/snapshots_test.go b/acceptance/openstack/blockstorage/v1/snapshots_test.go
index 5835048..bd6a961 100644
--- a/acceptance/openstack/blockstorage/v1/snapshots_test.go
+++ b/acceptance/openstack/blockstorage/v1/snapshots_test.go
@@ -47,8 +47,8 @@
t.Logf("Created snapshot: %+v\n", ss)
- err = snapshots.Delete(client, ss.ID)
- if err != nil {
+ res = snapshots.Delete(client, ss.ID)
+ if res.Err != nil {
t.Fatalf("Failed to delete snapshot: %v", err)
}
@@ -66,8 +66,8 @@
t.Log("Deleted snapshot\n")
- err = volumes.Delete(client, v.ID)
- if err != nil {
+ res = volumes.Delete(client, v.ID)
+ if res.Err != nil {
t.Errorf("Failed to delete volume: %v", err)
}
diff --git a/acceptance/openstack/blockstorage/v1/volumes_test.go b/acceptance/openstack/blockstorage/v1/volumes_test.go
index 6739a99..d2281e6 100644
--- a/acceptance/openstack/blockstorage/v1/volumes_test.go
+++ b/acceptance/openstack/blockstorage/v1/volumes_test.go
@@ -47,8 +47,8 @@
if err != nil {
t.Error(err)
}
- err = volumes.Delete(client, cv.ID)
- if err != nil {
+ res = volumes.Delete(client, cv.ID)
+ if res.Err != nil {
t.Error(err)
return
}
diff --git a/acceptance/rackspace/blockstorage/v1/snapshot_test.go b/acceptance/rackspace/blockstorage/v1/snapshot_test.go
index be1314b..25b2cfe 100644
--- a/acceptance/rackspace/blockstorage/v1/snapshot_test.go
+++ b/acceptance/rackspace/blockstorage/v1/snapshot_test.go
@@ -76,7 +76,7 @@
}
func testSnapshotDelete(t *testing.T, client *gophercloud.ServiceClient, id string) {
- err := snapshots.Delete(client, id)
- th.AssertNoErr(t, err)
+ res := snapshots.Delete(client, id)
+ th.AssertNoErr(t, res.Err)
t.Logf("Deleted snapshot %s", id)
}
diff --git a/acceptance/rackspace/blockstorage/v1/volume_test.go b/acceptance/rackspace/blockstorage/v1/volume_test.go
index 5a52ac7..f86f9ad 100644
--- a/acceptance/rackspace/blockstorage/v1/volume_test.go
+++ b/acceptance/rackspace/blockstorage/v1/volume_test.go
@@ -65,7 +65,7 @@
}
func testVolumeDelete(t *testing.T, client *gophercloud.ServiceClient, id string) {
- err := volumes.Delete(client, id)
- th.AssertNoErr(t, err)
+ res := volumes.Delete(client, id)
+ th.AssertNoErr(t, res.Err)
t.Logf("Deleted volume %s", id)
}
diff --git a/acceptance/rackspace/compute/v2/servers_test.go b/acceptance/rackspace/compute/v2/servers_test.go
index 5359450..58b5fa3 100644
--- a/acceptance/rackspace/compute/v2/servers_test.go
+++ b/acceptance/rackspace/compute/v2/servers_test.go
@@ -166,8 +166,8 @@
func deleteServer(t *testing.T, client *gophercloud.ServiceClient, server *os.Server) {
t.Logf("> servers.Delete")
- err := servers.Delete(client, server.ID)
- th.AssertNoErr(t, err)
+ res := servers.Delete(client, server.ID)
+ th.AssertNoErr(t, res.Err)
t.Logf("Server deleted successfully.")
}