Skip to content

Commit f5a4210

Browse files
committed
Add timeouts to the instance acceptance test to show they work
1 parent fb0bf1b commit f5a4210

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ fmt:
1313
gofmt -w $(GOFMT_FILES)
1414

1515
test_acceptance_debug:
16-
TF_LOG=DEBUG DEBUG=true TF_ORACLE_ENV=test TF_ACC=1 go test -v
16+
TF_LOG=DEBUG DEBUG=true TF_ORACLE_ENV=test TF_ACC=1 go test -v -timeout 120m
1717

1818
test_acceptance:
19-
TF_ORACLE_ENV=test TF_ACC=1 go test -v
19+
TF_ORACLE_ENV=test TF_ACC=1 go test -v -timeout 120m
2020

2121
build:
2222
go build -o terraform-provider-baremetal

provider_test.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,16 @@ resource "baremetal_core_instance" "t" {
125125
availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
126126
compartment_id = "${var.compartment_id}"
127127
display_name = "instance_name"
128-
image = "${data.baremetal_core_images.t.images.0.id}"
129-
shape = "${data.baremetal_core_shape.shapes.shapes.0.name}"
130-
subnet_id = "${baremetal_core_subnet.WebSubnetAD1.id}"
131-
metadata {
132-
ssh_authorized_keys = "${var.ssh_public_key}"
133-
}
128+
image = "${data.baremetal_core_images.t.images.0.id}"
129+
shape = "${data.baremetal_core_shape.shapes.shapes.0.name}"
130+
subnet_id = "${baremetal_core_subnet.WebSubnetAD1.id}"
131+
metadata {
132+
ssh_authorized_keys = "${var.ssh_public_key}"
133+
}
134+
135+
timeouts {
136+
create = "60m"
137+
}
134138
}
135139
`
136140

resource_obmcs_core_instance_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (s *ResourceCoreInstanceTestSuite) SetupTest() {
4646
s.Config = instanceConfig + `
4747
data "baremetal_core_instances" "s" {
4848
compartment_id = "${var.compartment_id}"
49-
availability_domain = availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
49+
availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
5050
}`
5151

5252
s.Config += testProviderConfig()
@@ -69,8 +69,8 @@ func (s *ResourceCoreInstanceTestSuite) TestCreateResourceCoreInstance() {
6969
resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
7070
resource.TestCheckResourceAttr(s.ResourceName, "state", baremetal.ResourceRunning),
7171
resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
72-
resource.TestCheckResourceAttr(s.ResourceName, "public_ip", "0.0.0.0"),
73-
resource.TestCheckResourceAttr(s.ResourceName, "private_ip", "0.0.0.0"),
72+
resource.TestCheckResourceAttrSet(s.ResourceName, "public_ip"),
73+
resource.TestCheckResourceAttrSet(s.ResourceName, "private_ip"),
7474
resource.TestCheckResourceAttrSet("data.baremetal_core_instances.s", "instances.#"),
7575
),
7676
},

0 commit comments

Comments
 (0)