fixing some core generated tests and adding the skip command to those that haven't been worked on

rcohenma · briangustafson · commit ccdbd8f8baa8 · 2018-05-10T16:05:57.000-07:00
diff --git a/provider/core_console_history_test.go b/provider/core_console_history_test.go
@@ -37,6 +37,7 @@ variable "console_history_state" { default = "state" }
 )
 
 func TestCoreConsoleHistoryResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -188,6 +189,7 @@ data "oci_core_console_histories" "test_console_histories" {
 }
 
 func TestCoreConsoleHistoryResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_dhcp_options_test.go b/provider/core_dhcp_options_test.go
@@ -47,6 +47,7 @@ variable "dhcp_options_state" { default = "state" }
 )
 
 func TestCoreDhcpOptionsResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -205,6 +206,7 @@ data "oci_core_dhcp_options" "test_dhcp_options" {
 }
 
 func TestCoreDhcpOptionsResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_drg_attachment_test.go b/provider/core_drg_attachment_test.go
@@ -176,86 +176,3 @@ data "oci_core_drg_attachments" "test_drg_attachments" {
 	})
 }
 
-func TestCoreDrgAttachmentResource_forcenew(t *testing.T) {
-	provider := testAccProvider
-	config := testProviderConfig()
-
-	compartmentId := getRequiredEnvSetting("compartment_id_for_create")
-	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
-
-	resourceName := "oci_core_drg_attachment.test_drg_attachment"
-
-	var resId, resId2 string
-
-	resource.Test(t, resource.TestCase{
-		Providers: map[string]terraform.ResourceProvider{
-			"oci": provider,
-		},
-		Steps: []resource.TestStep{
-			// verify create with optionals
-			{
-				Config: config + DrgAttachmentPropertyVariables + compartmentIdVariableStr + DrgAttachmentResourceConfig,
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
-					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
-					resource.TestCheckResourceAttrSet(resourceName, "drg_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttrSet(resourceName, "state"),
-					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
-
-					func(s *terraform.State) (err error) {
-						resId, err = fromInstanceState(s, resourceName, "id")
-						return err
-					},
-				),
-			},
-			// force new tests, test that changing a parameter would result in creation of a new resource.
-
-			{
-				Config: config + `
-variable "drg_attachment_display_name" { default = "displayName" }
-				` + compartmentIdVariableStr + DrgAttachmentResourceConfig,
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
-					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
-					resource.TestCheckResourceAttrSet(resourceName, "drg_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttrSet(resourceName, "state"),
-					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
-
-					func(s *terraform.State) (err error) {
-						resId2, err = fromInstanceState(s, resourceName, "id")
-						if resId == resId2 {
-							return fmt.Errorf("Resource was expected to be recreated when updating parameter DrgId but the id did not change.")
-						}
-						resId = resId2
-						return err
-					},
-				),
-			},
-
-			{
-				Config: config + `
-variable "drg_attachment_display_name" { default = "displayName" }
-				` + compartmentIdVariableStr + DrgAttachmentResourceConfig,
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
-					resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
-					resource.TestCheckResourceAttrSet(resourceName, "drg_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttrSet(resourceName, "state"),
-					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
-
-					func(s *terraform.State) (err error) {
-						resId2, err = fromInstanceState(s, resourceName, "id")
-						if resId == resId2 {
-							return fmt.Errorf("Resource was expected to be recreated when updating parameter VcnId but the id did not change.")
-						}
-						resId = resId2
-						return err
-					},
-				),
-			},
-		},
-	})
-}
diff --git a/provider/core_image_test.go b/provider/core_image_test.go
@@ -51,6 +51,7 @@ variable "image_state" { default = "state" }
 )
 
 func TestCoreImageResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -244,6 +245,7 @@ data "oci_core_images" "test_images" {
 }
 
 func TestCoreImageResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_instance_credential_test.go b/provider/core_instance_credential_test.go
@@ -22,6 +22,7 @@ variable "instance_credential_instance_id" { default = "instanceId" }
 )
 
 func TestCoreInstanceCredentialResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_internet_gateway_test.go b/provider/core_internet_gateway_test.go
@@ -176,13 +176,13 @@ data "oci_core_internet_gateways" "test_internet_gateways" {
 					resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
 					resource.TestCheckResourceAttrSet(datasourceName, "vcn_id"),
 
-					resource.TestCheckResourceAttr(datasourceName, "internet_gateways.#", "1"),
-					resource.TestCheckResourceAttr(datasourceName, "internet_gateways.0.compartment_id", compartmentId2),
-					resource.TestCheckResourceAttr(datasourceName, "internet_gateways.0.display_name", "displayName2"),
-					resource.TestCheckResourceAttr(datasourceName, "internet_gateways.0.enabled", "true"),
-					resource.TestCheckResourceAttrSet(datasourceName, "internet_gateways.0.id"),
-					resource.TestCheckResourceAttrSet(datasourceName, "internet_gateways.0.state"),
-					resource.TestCheckResourceAttrSet(datasourceName, "internet_gateways.0.vcn_id"),
+					resource.TestCheckResourceAttr(datasourceName, "gateways.#", "1"),
+					resource.TestCheckResourceAttr(datasourceName, "gateways.0.compartment_id", compartmentId2),
+					resource.TestCheckResourceAttr(datasourceName, "gateways.0.display_name", "displayName2"),
+					resource.TestCheckResourceAttr(datasourceName, "gateways.0.enabled", "true"),
+					resource.TestCheckResourceAttrSet(datasourceName, "gateways.0.id"),
+					resource.TestCheckResourceAttrSet(datasourceName, "gateways.0.state"),
+					resource.TestCheckResourceAttrSet(datasourceName, "gateways.0.vcn_id"),
 				),
 			},
 		},
@@ -250,31 +250,6 @@ variable "internet_gateway_state" { default = "state" }
 					},
 				),
 			},
-
-			{
-				Config: config + `
-variable "internet_gateway_display_name" { default = "MyInternetGateway" }
-variable "internet_gateway_enabled" { default = false }
-variable "internet_gateway_state" { default = "state" }
-				` + compartmentIdVariableStr2 + InternetGatewayResourceConfig,
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId2),
-					resource.TestCheckResourceAttr(resourceName, "display_name", "MyInternetGateway"),
-					resource.TestCheckResourceAttr(resourceName, "enabled", "false"),
-					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttrSet(resourceName, "state"),
-					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
-
-					func(s *terraform.State) (err error) {
-						resId2, err = fromInstanceState(s, resourceName, "id")
-						if resId == resId2 {
-							return fmt.Errorf("Resource was expected to be recreated when updating parameter VcnId but the id did not change.")
-						}
-						resId = resId2
-						return err
-					},
-				),
-			},
 		},
 	})
 }
diff --git a/provider/core_ip_sec_connection_test.go b/provider/core_ip_sec_connection_test.go
@@ -42,6 +42,7 @@ variable "ip_sec_connection_static_routes" { default = [] }
 )
 
 func TestCoreIpSecConnectionResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -191,6 +192,7 @@ data "oci_core_ip_sec_connections" "test_ip_sec_connections" {
 }
 
 func TestCoreIpSecConnectionResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_private_ip_test.go b/provider/core_private_ip_test.go
@@ -40,6 +40,7 @@ variable "private_ip_subnet_id" { default = "subnetId" }
 )
 
 func TestCorePrivateIpResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -179,6 +180,7 @@ data "oci_core_private_ips" "test_private_ips" {
 }
 
 func TestCorePrivateIpResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_route_table_test.go b/provider/core_route_table_test.go
@@ -278,33 +278,6 @@ variable "route_table_state" { default = "state" }
 					},
 				),
 			},
-
-			{
-				Config: config + `
-variable "route_table_display_name" { default = "MyRouteTable" }
-variable "route_table_route_rules_cidr_block" { default = "0.0.0.0/0" }
-variable "route_table_state" { default = "state" }
-				` + compartmentIdVariableStr2 + RouteTableResourceConfig,
-				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId2),
-					resource.TestCheckResourceAttr(resourceName, "display_name", "MyRouteTable"),
-					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "route_rules.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "route_rules.0.cidr_block", "0.0.0.0/0"),
-					resource.TestCheckResourceAttrSet(resourceName, "route_rules.0.network_entity_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "state"),
-					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),
-
-					func(s *terraform.State) (err error) {
-						resId2, err = fromInstanceState(s, resourceName, "id")
-						if resId == resId2 {
-							return fmt.Errorf("Resource was expected to be recreated when updating parameter VcnId but the id did not change.")
-						}
-						resId = resId2
-						return err
-					},
-				),
-			},
 		},
 	})
 }
diff --git a/provider/core_security_list_test.go b/provider/core_security_list_test.go
@@ -160,6 +160,7 @@ variable "security_list_state" { default = "state" }
 )
 
 func TestCoreSecurityListResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -557,6 +558,7 @@ data "oci_core_security_lists" "test_security_lists" {
 }
 
 func TestCoreSecurityListResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_subnet_test.go b/provider/core_subnet_test.go
@@ -53,6 +53,7 @@ variable "subnet_state" { default = "state" }
 )
 
 func TestCoreSubnetResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -254,6 +255,7 @@ data "oci_core_subnets" "test_subnets" {
 }
 
 func TestCoreSubnetResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_vnic_attachment_test.go b/provider/core_vnic_attachment_test.go
@@ -63,6 +63,7 @@ variable "vnic_attachment_vnic_id" { default = "vnicId" }
 )
 
 func TestCoreVnicAttachmentResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -222,6 +223,7 @@ data "oci_core_vnic_attachments" "test_vnic_attachments" {
 }
 
 func TestCoreVnicAttachmentResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_vnic_test.go b/provider/core_vnic_test.go
@@ -23,6 +23,7 @@ variable "vnic_vnic_id" { default = "vnicId" }
 )
 
 func TestCoreVnicResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -112,6 +113,7 @@ data "oci_core_vnics" "test_vnics" {
 }
 
 func TestCoreVnicResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_volume_attachment_test.go b/provider/core_volume_attachment_test.go
@@ -43,6 +43,7 @@ variable "volume_attachment_is_read_only" { default = false }
 )
 
 func TestCoreVolumeAttachmentResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -181,6 +182,7 @@ data "oci_core_volume_attachments" "test_volume_attachments" {
 }
 
 func TestCoreVolumeAttachmentResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
diff --git a/provider/core_volume_backup_test.go b/provider/core_volume_backup_test.go
@@ -38,6 +38,7 @@ variable "volume_backup_type" { default = "type" }
 )
 
 func TestCoreVolumeBackupResource_basic(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 
@@ -189,6 +190,7 @@ data "oci_core_volume_backups" "test_volume_backups" {
 }
 
 func TestCoreVolumeBackupResource_forcenew(t *testing.T) {
+	t.Skip("Skipping generated test for now as it has not been worked on.")
 	provider := testAccProvider
 	config := testProviderConfig()
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ variable "console_history_state" { default = "state" }`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`func TestCoreConsoleHistoryResource_basic(t *testing.T) {`
	`40`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`40`	`41`	`provider := testAccProvider`
`41`	`42`	`config := testProviderConfig()`
`42`	`43`
`@@ -188,6 +189,7 @@ data "oci_core_console_histories" "test_console_histories" {`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`func TestCoreConsoleHistoryResource_forcenew(t *testing.T) {`
	`192`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`191`	`193`	`provider := testAccProvider`
`192`	`194`	`config := testProviderConfig()`
`193`	`195`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ variable "dhcp_options_state" { default = "state" }`
`47`	`47`	`)`
`48`	`48`
`49`	`49`	`func TestCoreDhcpOptionsResource_basic(t *testing.T) {`
	`50`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`50`	`51`	`provider := testAccProvider`
`51`	`52`	`config := testProviderConfig()`
`52`	`53`
`@@ -205,6 +206,7 @@ data "oci_core_dhcp_options" "test_dhcp_options" {`
`205`	`206`	`}`
`206`	`207`
`207`	`208`	`func TestCoreDhcpOptionsResource_forcenew(t *testing.T) {`
	`209`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`208`	`210`	`provider := testAccProvider`
`209`	`211`	`config := testProviderConfig()`
`210`	`212`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ variable "image_state" { default = "state" }`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`func TestCoreImageResource_basic(t *testing.T) {`
	`54`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`54`	`55`	`provider := testAccProvider`
`55`	`56`	`config := testProviderConfig()`
`56`	`57`
`@@ -244,6 +245,7 @@ data "oci_core_images" "test_images" {`
`244`	`245`	`}`
`245`	`246`
`246`	`247`	`func TestCoreImageResource_forcenew(t *testing.T) {`
	`248`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`247`	`249`	`provider := testAccProvider`
`248`	`250`	`config := testProviderConfig()`
`249`	`251`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ variable "instance_credential_instance_id" { default = "instanceId" }`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func TestCoreInstanceCredentialResource_basic(t *testing.T) {`
	`25`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`25`	`26`	`provider := testAccProvider`
`26`	`27`	`config := testProviderConfig()`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ variable "ip_sec_connection_static_routes" { default = [] }`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`func TestCoreIpSecConnectionResource_basic(t *testing.T) {`
	`45`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`45`	`46`	`provider := testAccProvider`
`46`	`47`	`config := testProviderConfig()`
`47`	`48`
`@@ -191,6 +192,7 @@ data "oci_core_ip_sec_connections" "test_ip_sec_connections" {`
`191`	`192`	`}`
`192`	`193`
`193`	`194`	`func TestCoreIpSecConnectionResource_forcenew(t *testing.T) {`
	`195`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`194`	`196`	`provider := testAccProvider`
`195`	`197`	`config := testProviderConfig()`
`196`	`198`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ variable "private_ip_subnet_id" { default = "subnetId" }`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`func TestCorePrivateIpResource_basic(t *testing.T) {`
	`43`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`43`	`44`	`provider := testAccProvider`
`44`	`45`	`config := testProviderConfig()`
`45`	`46`
`@@ -179,6 +180,7 @@ data "oci_core_private_ips" "test_private_ips" {`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`func TestCorePrivateIpResource_forcenew(t *testing.T) {`
	`183`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`182`	`184`	`provider := testAccProvider`
`183`	`185`	`config := testProviderConfig()`
`184`	`186`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ variable "security_list_state" { default = "state" }`
`160`	`160`	`)`
`161`	`161`
`162`	`162`	`func TestCoreSecurityListResource_basic(t *testing.T) {`
	`163`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`163`	`164`	`provider := testAccProvider`
`164`	`165`	`config := testProviderConfig()`
`165`	`166`
`@@ -557,6 +558,7 @@ data "oci_core_security_lists" "test_security_lists" {`
`557`	`558`	`}`
`558`	`559`
`559`	`560`	`func TestCoreSecurityListResource_forcenew(t *testing.T) {`
	`561`	`+ t.Skip("Skipping generated test for now as it has not been worked on.")`
`560`	`562`	`provider := testAccProvider`
`561`	`563`	`config := testProviderConfig()`
`562`	`564`