Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: misc cleanup after test reorg #5239

Merged
merged 2 commits into from
Dec 25, 2019
Merged

tests: misc cleanup after test reorg #5239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a83569a
tests: misc cleanup after test reorg
katbyte Dec 23, 2019
be3f563
one more change
katbyte Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions ...rm/internal/services/analysisservices/tests/resource_arm_analysis_services_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ func TestAccAzureRMAnalysisServicesServer_basic(t *testing.T) {
testCheckAzureRMAnalysisServicesServerExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -170,19 +166,11 @@ func TestAccAzureRMAnalysisServicesServer_adminUsers(t *testing.T) {
{
Config: preConfig,
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
{
Config: postConfig,
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -202,11 +190,7 @@ func TestAccAzureRMAnalysisServicesServer_serverFullName(t *testing.T) {
resource.TestCheckResourceAttrSet(data.ResourceName, "server_full_name"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down
42 changes: 7 additions & 35 deletions ...m/internal/services/apimanagement/tests/resource_arm_api_management_api_operation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func TestAccAzureRMApiManagementApiOperation_basic(t *testing.T) {
testCheckAzureRMApiManagementApiOperationExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -73,11 +69,7 @@ func TestAccAzureRMApiManagementApiOperation_customMethod(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "method", "HAMMERTIME"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -96,11 +88,7 @@ func TestAccAzureRMApiManagementApiOperation_headers(t *testing.T) {
testCheckAzureRMApiManagementApiOperationExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -119,22 +107,14 @@ func TestAccAzureRMApiManagementApiOperation_requestRepresentations(t *testing.T
testCheckAzureRMApiManagementApiOperationExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
{
Config: testAccAzureRMApiManagementApiOperation_requestRepresentationUpdated(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMApiManagementApiOperationExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -154,22 +134,14 @@ func TestAccAzureRMApiManagementApiOperation_representations(t *testing.T) {
testCheckAzureRMApiManagementApiOperationExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
{
Config: testAccAzureRMApiManagementApiOperation_representationUpdated(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMApiManagementApiOperationExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down
6 changes: 1 addition & 5 deletions azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func TestAccAzureRMApiManagementApiSchema_basic(t *testing.T) {
testCheckAzureRMApiManagementApiSchemaExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down
38 changes: 7 additions & 31 deletions azurerm/internal/services/apimanagement/tests/resource_arm_api_management_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ func TestAccAzureRMApiManagementApi_basic(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "is_online", "false"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -56,11 +52,7 @@ func TestAccAzureRMApiManagementApi_basicClassic(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "is_online", "false"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -80,11 +72,7 @@ func TestAccAzureRMApiManagementApi_wordRevision(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "revision", "one-point-oh"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -104,11 +92,7 @@ func TestAccAzureRMApiManagementApi_version(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "version", "v1"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -150,11 +134,7 @@ func TestAccAzureRMApiManagementApi_soapPassthrough(t *testing.T) {
testCheckAzureRMApiManagementApiExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -269,11 +249,7 @@ func TestAccAzureRMApiManagementApi_complete(t *testing.T) {
testCheckAzureRMApiManagementApiExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -548,7 +524,7 @@ resource "azurerm_api_management" "test" {
func testAccAzureRMApiManagementApi_templateClassic(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestrg-%d"
name = "acctestRG-%d"
location = "%s"
}

Expand Down
24 changes: 4 additions & 20 deletions ...internal/services/apimanagement/tests/resource_arm_api_management_api_version_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func TestAccAzureRMApiManagementApiVersionSet_basic(t *testing.T) {
testCheckAzureRMApiManagementApiVersionSetExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -72,11 +68,7 @@ func TestAccAzureRMApiManagementApiVersionSet_header(t *testing.T) {
testCheckAzureRMApiManagementApiVersionSetExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -95,11 +87,7 @@ func TestAccAzureRMApiManagementApiVersionSet_query(t *testing.T) {
testCheckAzureRMApiManagementApiVersionSetExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -128,11 +116,7 @@ func TestAccAzureRMApiManagementApiVersionSet_update(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "display_name", fmt.Sprintf("TestApiVersionSet2%d", data.RandomInteger)),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down
12 changes: 2 additions & 10 deletions ...nal/services/apimanagement/tests/resource_arm_api_management_authorization_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func TestAccAzureRMAPIManagementAuthorizationServer_basic(t *testing.T) {
testCheckAzureRMAPIManagementAuthorizationServerExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -72,11 +68,7 @@ func TestAccAzureRMAPIManagementAuthorizationServer_complete(t *testing.T) {
testCheckAzureRMAPIManagementAuthorizationServerExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down
24 changes: 4 additions & 20 deletions azurerm/internal/services/apimanagement/tests/resource_arm_api_management_backend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ func TestAccAzureRMApiManagementBackend_basic(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "url", "https://acctest"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -71,11 +67,7 @@ func TestAccAzureRMApiManagementBackend_allProperties(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "tls.0.validate_certificate_name", "true"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand All @@ -94,11 +86,7 @@ func TestAccAzureRMApiManagementBackend_credentialsNoCertificate(t *testing.T) {
testCheckAzureRMApiManagementBackendExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down Expand Up @@ -173,11 +161,7 @@ func TestAccAzureRMApiManagementBackend_serviceFabric(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "service_fabric_cluster.0.server_certificate_thumbprints.#", "2"),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down
6 changes: 1 addition & 5 deletions azurerm/internal/services/apimanagement/tests/resource_arm_api_management_diagnostic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ func TestAccAzureRMApiManagementDiagnostic_basic(t *testing.T) {
testCheckAzureRMApiManagementDiagnosticExists(data.ResourceName),
),
},
{
ResourceName: data.ResourceName,
ImportState: true,
ImportStateVerify: true,
},
data.ImportStep(),
},
})
}
Expand Down
Loading