Skip to content

Commit

Permalink
minor fix on terraform e2e (#460)
Browse files Browse the repository at this point in the history
* minor fix on terraform e2e

Signed-off-by: Qiaozp <[email protected]>

* names

Signed-off-by: Qiaozp <[email protected]>

Signed-off-by: Qiaozp <[email protected]>
  • Loading branch information
chivalryq authored Sep 6, 2022
1 parent e8b00a8 commit e07244f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions test/e2e-test/terraform-test/terraform_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ var _ = Describe("Terraform Test", func() {
return fmt.Errorf("configuration %s is not available, current status %s", cfgName, config.Status.Apply.State)
}
return nil
}, 10*time.Minute, 2*time.Second).Should(Succeed())
}, 15*time.Minute, 2*time.Second).Should(Succeed())
}

verifyConfigurationDeleted := func(cfgName string) {
Expand Down Expand Up @@ -154,7 +154,7 @@ var _ = Describe("Terraform Test", func() {
verifyConfigurationDeleted("sample-redis")
})

FIt("Test rds-instance and rds-database", func() {
It("Test rds-instance and rds-database", func() {
By("apply instance and database in order")
applyApp("rds-instance.yaml")
rdsConfName := "sample-rds-instance"
Expand All @@ -165,7 +165,7 @@ var _ = Describe("Terraform Test", func() {
"existing_instance_id": cfg.Status.Apply.Outputs["instance_id"].Value,
"region": "cn-hangzhou",
"database_name": "first_database",
"password": "fake_password",
"password": "U34rfwefwefffaked",
"account_name": "db_account",
}
json, err := json2.Marshal(args)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-test/terraform-test/testdata/rds-database.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: core.oam.dev/v1beta1
kind: Application
metadata:
name: app-rds-database
name: regular-check-rds-database
spec:
components:
- name: sample-rds-database
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-test/terraform-test/testdata/rds-instance.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: core.oam.dev/v1beta1
kind: Application
metadata:
name: app-rds-instance
name: regular-check-rds-instance
spec:
components:
- name: sample-rds-instance
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-test/terraform-test/testdata/redis.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: core.oam.dev/v1beta1
kind: Application
metadata:
name: regular-check-rds
name: regular-check-redis
spec:
components:
- name: sample-redis
Expand Down

0 comments on commit e07244f

Please sign in to comment.