[Fix] Fix tests

acceptance/openstack/autoscaling/v1/lifecycle_hooks_test.go

@@ -11,27 +11,24 @@ import (
 )
 
 func TestLifecycleHooksLifecycle(t *testing.T) {
-	client, err := clients.NewAutoscalingV1Client()
-	th.AssertNoErr(t, err)
 
 	networkID := clients.EnvOS.GetEnv("NETWORK_ID")
 	vpcID := clients.EnvOS.GetEnv("VPC_ID")
 	if networkID == "" || vpcID == "" {
 		t.Skip("OS_NETWORK_ID or OS_VPC_ID env vars are missing but are required for AS Lifecycle Hooks test")
 	}
 
+	client, err := clients.NewAutoscalingV1Client()
+	th.AssertNoErr(t, err)
+
 	groupID := autoscaling.CreateAutoScalingGroup(t, client, networkID, vpcID, tools.RandomString("as-group-create-", 3))
-	t.Cleanup(func() {
-		autoscaling.DeleteAutoScalingGroup(t, client, groupID)
-	})
 
 	topicName := tools.RandomString("as-lifecycle-hooks-topic-", 3)
 	t.Logf("Attempting to create Topic: %s", topicName)
 	topicURN, err := autoscaling.GetNotificationTopicURN(topicName)
 	if err != nil {
 		t.Logf("Error while creating the notification topic: %s", topicName)
 	}
-	defer autoscaling.DeleteTopic(t, topicURN)
 	lifecycleHookName := tools.RandomString("as-lifecycle-hook-create-", 3)
 	createOpts := lifecyclehooks.CreateOpts{
 		LifecycleHookName:    lifecycleHookName,
@@ -66,8 +63,13 @@ func TestLifecycleHooksLifecycle(t *testing.T) {
 		tools.PrintResource(t, lifecycleHook)
 	}
 
-	t.Logf("Attempting to delete Lifecycle Hook")
-	err = lifecyclehooks.Delete(client, groupID, lifecycleHookName)
-	th.AssertNoErr(t, err)
-	t.Logf("Deleted Lifecycle Hook: %s", lifecycleHookName)
+	t.Cleanup(func() {
+		t.Logf("Attempting to delete Lifecycle Hook")
+		err = lifecyclehooks.Delete(client, groupID, lifecycleHookName)
+		th.AssertNoErr(t, err)
+		t.Logf("Deleted Lifecycle Hook: %s", lifecycleHookName)
+
+		autoscaling.DeleteTopic(t, topicURN)
+		autoscaling.DeleteAutoScalingGroup(t, client, groupID)
+	})
 }