ExtractErrResult -> ErrResult; Extract -> ExtractErr
diff --git a/acceptance/openstack/blockstorage/v1/snapshots_test.go b/acceptance/openstack/blockstorage/v1/snapshots_test.go
index 1e639de..beba96c 100644
--- a/acceptance/openstack/blockstorage/v1/snapshots_test.go
+++ b/acceptance/openstack/blockstorage/v1/snapshots_test.go
@@ -47,7 +47,7 @@
t.Logf("Created snapshot: %+v\n", ss)
- err = snapshots.Delete(client, ss.ID).Extract()
+ err = snapshots.Delete(client, ss.ID).ExtractErr()
if err != nil {
t.Fatalf("Failed to delete snapshot: %v", err)
}
@@ -66,7 +66,7 @@
t.Log("Deleted snapshot\n")
- err = volumes.Delete(client, v.ID).Extract()
+ err = volumes.Delete(client, v.ID).ExtractErr()
if 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 b2f2600..924a95d 100644
--- a/acceptance/openstack/blockstorage/v1/volumes_test.go
+++ b/acceptance/openstack/blockstorage/v1/volumes_test.go
@@ -47,7 +47,7 @@
if err != nil {
t.Error(err)
}
- err = volumes.Delete(client, cv.ID).Extract()
+ err = volumes.Delete(client, cv.ID).ExtractErr()
if err != nil {
t.Error(err)
return
diff --git a/acceptance/openstack/blockstorage/v1/volumetypes_test.go b/acceptance/openstack/blockstorage/v1/volumetypes_test.go
index 416e341..fe13b1d 100644
--- a/acceptance/openstack/blockstorage/v1/volumetypes_test.go
+++ b/acceptance/openstack/blockstorage/v1/volumetypes_test.go
@@ -29,7 +29,7 @@
}
defer func() {
time.Sleep(10000 * time.Millisecond)
- err = volumetypes.Delete(client, vt.ID)
+ err = volumetypes.Delete(client, vt.ID).ExtractErr()
if err != nil {
t.Error(err)
return
diff --git a/acceptance/rackspace/compute/v2/keypairs_test.go b/acceptance/rackspace/compute/v2/keypairs_test.go
index ac5a1f2..9bd6eb4 100644
--- a/acceptance/rackspace/compute/v2/keypairs_test.go
+++ b/acceptance/rackspace/compute/v2/keypairs_test.go
@@ -14,7 +14,7 @@
)
func deleteKeyPair(t *testing.T, client *gophercloud.ServiceClient, name string) {
- err := keypairs.Delete(client, name).Extract()
+ err := keypairs.Delete(client, name).ExtractErr()
th.AssertNoErr(t, err)
t.Logf("Successfully deleted key [%s].", name)
}
diff --git a/acceptance/rackspace/compute/v2/servers_test.go b/acceptance/rackspace/compute/v2/servers_test.go
index 58b5fa3..511f0a9 100644
--- a/acceptance/rackspace/compute/v2/servers_test.go
+++ b/acceptance/rackspace/compute/v2/servers_test.go
@@ -175,7 +175,7 @@
func deleteServerKeyPair(t *testing.T, client *gophercloud.ServiceClient, k *oskey.KeyPair) {
t.Logf("> keypairs.Delete")
- err := keypairs.Delete(client, k.Name).Extract()
+ err := keypairs.Delete(client, k.Name).ExtractErr()
th.AssertNoErr(t, err)
t.Logf("Keypair deleted successfully.")