Fixing acceptance tests which failed to clean up network resources
diff --git a/acceptance/openstack/compute/v2/servers_test.go b/acceptance/openstack/compute/v2/servers_test.go
index 3113aeb..bd1df9c 100644
--- a/acceptance/openstack/compute/v2/servers_test.go
+++ b/acceptance/openstack/compute/v2/servers_test.go
@@ -157,7 +157,7 @@
}
randomPassword := tools.MakeNewPassword(server.AdminPass)
- res = servers.ChangeAdminPassword(client, server.ID, randomPassword)
+ res := servers.ChangeAdminPassword(client, server.ID, randomPassword)
if res.Err != nil {
t.Fatal(err)
}
@@ -194,7 +194,7 @@
t.Fatal(err)
}
- res = servers.Reboot(client, server.ID, "aldhjflaskhjf")
+ res := servers.Reboot(client, server.ID, "aldhjflaskhjf")
if res.Err == nil {
t.Fatal("Expected the SDK to provide an ArgumentError here")
}
@@ -271,7 +271,7 @@
t.Logf("Attempting to resize server [%s]", server.ID)
if res := servers.Resize(client, server.ID, choices.FlavorIDResize); res.Err != nil {
- t.Fatal(err)
+ t.Fatal(res.Err)
}
if err := waitForStatus(client, server, "VERIFY_RESIZE"); err != nil {
diff --git a/acceptance/openstack/networking/v2/extensions/lbaas/common.go b/acceptance/openstack/networking/v2/extensions/lbaas/common.go
index a9db1af..27dfe5f 100644
--- a/acceptance/openstack/networking/v2/extensions/lbaas/common.go
+++ b/acceptance/openstack/networking/v2/extensions/lbaas/common.go
@@ -61,7 +61,7 @@
func CreateMonitor(t *testing.T) string {
m, err := monitors.Create(base.Client, monitors.CreateOpts{
- Delay: 5,
+ Delay: 10,
Timeout: 10,
MaxRetries: 3,
Type: monitors.TypeHTTP,
diff --git a/acceptance/openstack/networking/v2/extensions/lbaas/monitor_test.go b/acceptance/openstack/networking/v2/extensions/lbaas/monitor_test.go
index 57e860c..9056fff 100644
--- a/acceptance/openstack/networking/v2/extensions/lbaas/monitor_test.go
+++ b/acceptance/openstack/networking/v2/extensions/lbaas/monitor_test.go
@@ -51,7 +51,7 @@
}
func updateMonitor(t *testing.T, monitorID string) {
- opts := monitors.UpdateOpts{Delay: 5, Timeout: 10, MaxRetries: 3}
+ opts := monitors.UpdateOpts{Delay: 10, Timeout: 10, MaxRetries: 3}
m, err := monitors.Update(base.Client, monitorID, opts).Extract()
th.AssertNoErr(t, err)