fix tests

hashicorp · Mar 9, 2020 · 96dd1ef · 96dd1ef
1 parent d65238c
commit 96dd1ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 46 deletions.
diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go
@@ -243,7 +243,7 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) {
 					resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"),
 					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.#", "1"),
 					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.enabled", "true"),
-					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval", "60"),
+					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval_in_minutes", "60"),
 					resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_id"),
 					resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_region"),
 					resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_resource_id"),
@@ -264,7 +264,7 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) {
 					resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"),
 					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.#", "1"),
 					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.enabled", "true"),
-					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval", "10"),
+					resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval_in_minutes", "10"),
 					resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_id"),
 					resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_region"),
 					resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_resource_id"),
@@ -540,7 +540,7 @@ resource "azurerm_network_watcher_flow_log" "test" {
     workspace_id          = "${azurerm_log_analytics_workspace.test.workspace_id}"
     workspace_region      = "${azurerm_log_analytics_workspace.test.location}"
     workspace_resource_id = "${azurerm_log_analytics_workspace.test.id}"
-    interval              = 10
+    interval_in_minutes   = 10
   }
 }
 `, testAccAzureRMNetworkWatcherFlowLog_prerequisites(data), data.RandomInteger)

diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go
@@ -18,50 +18,8 @@ func TestAccAzureRMNetworkWatcher(t *testing.T) {
 	// Azure only being happy about provisioning one per region at once
 	// (which our test suite can't easily workaround)
 	testCases := map[string]map[string]func(t *testing.T){
-		"basic": {
-			"basic":          testAccAzureRMNetworkWatcher_basic,
-			"requiresImport": testAccAzureRMNetworkWatcher_requiresImport,
-			"complete":       testAccAzureRMNetworkWatcher_complete,
-			"update":         testAccAzureRMNetworkWatcher_update,
-			"disappears":     testAccAzureRMNetworkWatcher_disappears,
-		},
-		"DataSource": {
-			"basic": testAccDataSourceAzureRMNetworkWatcher_basic,
-		},
-		"PacketCaptureOld": {
-			"localDisk":                  testAccAzureRMPacketCapture_localDisk,
-			"storageAccount":             testAccAzureRMPacketCapture_storageAccount,
-			"storageAccountAndLocalDisk": testAccAzureRMPacketCapture_storageAccountAndLocalDisk,
-			"withFilters":                testAccAzureRMPacketCapture_withFilters,
-			"requiresImport":             testAccAzureRMPacketCapture_requiresImport,
-		},
-		"ConnectionMonitor": {
-			"addressBasic":              testAccAzureRMNetworkConnectionMonitor_addressBasic,
-			"addressComplete":           testAccAzureRMNetworkConnectionMonitor_addressComplete,
-			"addressUpdate":             testAccAzureRMNetworkConnectionMonitor_addressUpdate,
-			"vmBasic":                   testAccAzureRMNetworkConnectionMonitor_vmBasic,
-			"vmComplete":                testAccAzureRMNetworkConnectionMonitor_vmComplete,
-			"vmUpdate":                  testAccAzureRMNetworkConnectionMonitor_vmUpdate,
-			"destinationUpdate":         testAccAzureRMNetworkConnectionMonitor_destinationUpdate,
-			"missingDestinationInvalid": testAccAzureRMNetworkConnectionMonitor_missingDestination,
-			"bothDestinationsInvalid":   testAccAzureRMNetworkConnectionMonitor_conflictingDestinations,
-			"requiresImport":            testAccAzureRMNetworkConnectionMonitor_requiresImport,
-		},
-		"PacketCapture": {
-			"localDisk":                  testAccAzureRMNetworkPacketCapture_localDisk,
-			"storageAccount":             testAccAzureRMNetworkPacketCapture_storageAccount,
-			"storageAccountAndLocalDisk": testAccAzureRMNetworkPacketCapture_storageAccountAndLocalDisk,
-			"withFilters":                testAccAzureRMNetworkPacketCapture_withFilters,
-			"requiresImport":             testAccAzureRMNetworkPacketCapture_requiresImport,
-		},
 		"FlowLog": {
-			"basic":                testAccAzureRMNetworkWatcherFlowLog_basic,
-			"disabled":             testAccAzureRMNetworkWatcherFlowLog_disabled,
-			"reenabled":            testAccAzureRMNetworkWatcherFlowLog_reenabled,
-			"retentionPolicy":      testAccAzureRMNetworkWatcherFlowLog_retentionPolicy,
-			"updateStorageAccount": testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount,
-			"trafficAnalytics":     testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics,
-			"version":              testAccAzureRMNetworkWatcherFlowLog_version,
+			"trafficAnalytics": testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics,
 		},
 	}