Missed some tests

hashicorp · Oct 3, 2017 · 531ef1e · 531ef1e
1 parent 79334bc
commit 531ef1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/azurerm/resource_arm_servicebus_namespace_test.go b/azurerm/resource_arm_servicebus_namespace_test.go
@@ -30,7 +30,7 @@ func testSweepServiceBusNamespace(region string) error {
 	client := (*armClient).serviceBusNamespacesClient
 
 	log.Printf("Retrieving the Servicebus Namespaces..")
-	results, err := client.ListBySubscription()
+	results, err := client.List()
 	if err != nil {
 		return fmt.Errorf("Error Listing on Servicebus Namespaces: %+v", err)
 	}

diff --git a/azurerm/resource_arm_sql_server_test.go b/azurerm/resource_arm_sql_server_test.go
@@ -46,7 +46,8 @@ func testSweepSQLServer(region string) error {
 		name := resourceId.Path["servers"]
 
 		log.Printf("Deleting SQL Server '%s' in Resource Group '%s'", name, resourceGroup)
-		_, err = client.Delete(resourceGroup, name)
+		_, deleteErr := client.Delete(resourceGroup, name, make(chan struct{}))
+		err = <-deleteErr
 		if err != nil {
 			return err
 		}
@@ -194,13 +195,13 @@ func testCheckAzureRMSqlServerDisappears(name string) resource.TestCheckFunc {
 
 		client := testAccProvider.Meta().(*ArmClient).sqlServersClient
 
-		resp, err := client.Delete(resourceGroup, serverName)
+		deleteResp, deleteErr := client.Delete(resourceGroup, serverName, make(chan struct{}))
+		resp := <-deleteResp
+		err := <-deleteErr
 		if err != nil {
-			if utils.ResponseWasNotFound(resp) {
-				return nil
+			if !utils.ResponseWasNotFound(resp) {
+				return fmt.Errorf("Bad: Delete on sqlServersClient: %+v", err)
 			}
-
-			return fmt.Errorf("Bad: Delete on sqlServersClient: %+v", err)
 		}
 
 		return nil