Skip to content

fix: support unit test parallel #1011

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

Merged
merged 1 commit into from
Apr 27, 2022
Merged

fix: support unit test parallel #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions tencentcloud/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ func testAccPreCheck(t *testing.T) {
}
}

func testAccStepPreConfigSetTempAKSK(t *testing.T, accountType string) {
testAccPreCheckCommon(t, accountType)
}

func testAccPreCheckCommon(t *testing.T, accountType string) {
if v := os.Getenv(PROVIDER_REGION); v == "" {
log.Printf("[INFO] Testing: Using %s as test region", defaultRegion)
Expand Down Expand Up @@ -97,6 +101,14 @@ func testAccPreCheckCommon(t *testing.T, accountType string) {
}
os.Setenv(PROVIDER_SECRET_ID, secretId)
os.Setenv(PROVIDER_SECRET_KEY, secretKey)
case accountType == ACCOUNT_TYPE_COMMON:
secretId := os.Getenv(COMMON_PROVIDER_SECRET_ID)
secretKey := os.Getenv(COMMON_PROVIDER_SECRET_KEY)
if secretId == "" || secretKey == "" {
t.Fatalf("%v and %v must be set for acceptance tests\n", COMMON_PROVIDER_SECRET_ID, COMMON_PROVIDER_SECRET_KEY)
}
os.Setenv(PROVIDER_SECRET_ID, secretId)
os.Setenv(PROVIDER_SECRET_KEY, secretKey)
default:
if v := os.Getenv(PROVIDER_SECRET_ID); v == "" {
t.Fatalf("%v must be set for acceptance tests\n", PROVIDER_SECRET_ID)
Expand Down
82 changes: 52 additions & 30 deletions tencentcloud/resource_tc_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ func TestAccTencentCloudInstanceBasic(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceBasic,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceBasic,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -84,7 +85,8 @@ func TestAccTencentCloudInstanceBasic(t *testing.T) {
),
},
{
Config: testAccTencentCloudInstanceModifyInstanceType,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceModifyInstanceType,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudInstanceExists(id),
resource.TestCheckResourceAttr(id, "instance_status", "RUNNING"),
Expand Down Expand Up @@ -112,7 +114,8 @@ func TestAccTencentCloudInstanceWithDataDisk(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithDataDisk,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithDataDisk,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -127,7 +130,8 @@ func TestAccTencentCloudInstanceWithDataDisk(t *testing.T) {
),
},
{
Config: testAccTencentCloudInstanceWithDataDiskUpdate,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithDataDiskUpdate,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand Down Expand Up @@ -156,7 +160,8 @@ func TestAccTencentCloudInstanceWithNetwork(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithNetworkFalse("false"),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithNetworkFalse("false"),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -165,7 +170,8 @@ func TestAccTencentCloudInstanceWithNetwork(t *testing.T) {
),
},
{
Config: testAccTencentCloudInstanceWithNetwork("true", 5),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithNetwork("true", 5),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -179,7 +185,7 @@ func TestAccTencentCloudInstanceWithNetwork(t *testing.T) {
}

func TestAccTencentCloudInstanceWithPrivateIP(t *testing.T) {

t.Parallel()
id := "tencentcloud_instance.foo"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -188,7 +194,8 @@ func TestAccTencentCloudInstanceWithPrivateIP(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithPrivateIP,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithPrivateIP,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -210,7 +217,8 @@ func TestAccTencentCloudInstanceWithKeyPair(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithKeyPair("key_pair_0"),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithKeyPair("key_pair_0"),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -219,7 +227,8 @@ func TestAccTencentCloudInstanceWithKeyPair(t *testing.T) {
),
},
{
Config: testAccTencentCloudInstanceWithKeyPair("key_pair_1"),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithKeyPair("key_pair_1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -242,7 +251,8 @@ func TestAccTencentCloudInstanceWithPassword(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithPassword("TF_test_123"),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithPassword("TF_test_123"),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -251,7 +261,8 @@ func TestAccTencentCloudInstanceWithPassword(t *testing.T) {
),
},
{
Config: testAccTencentCloudInstanceWithPassword("TF_test_123456"),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithPassword("TF_test_123456"),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -264,17 +275,17 @@ func TestAccTencentCloudInstanceWithPassword(t *testing.T) {
}

func TestAccTencentCloudInstanceWithImageLogin(t *testing.T) {
t.Parallel()

id := "tencentcloud_instance.foo"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
PreCheck: func() { testAccPreCheck(t) },
IDRefreshName: id,
Providers: testAccProviders,
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithImageLogin,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
Config: testAccTencentCloudInstanceWithImageLogin,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -297,7 +308,8 @@ func TestAccTencentCloudInstanceWithName(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithName(defaultInsName),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithName(defaultInsName),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -306,7 +318,8 @@ func TestAccTencentCloudInstanceWithName(t *testing.T) {
),
},
{
Config: testAccTencentCloudInstanceWithName(defaultInsNameUpdate),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithName(defaultInsNameUpdate),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -329,7 +342,8 @@ func TestAccTencentCloudInstanceWithHostname(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithHostname,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithHostname,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -356,7 +370,8 @@ func TestAccTencentCloudInstanceWithSecurityGroup(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithSecurityGroup(`[tencentcloud_security_group.foo.id]`),
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithSecurityGroup(`[tencentcloud_security_group.foo.id]`),
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(instanceId),
testAccCheckTencentCloudInstanceExists(instanceId),
Expand All @@ -370,6 +385,7 @@ func TestAccTencentCloudInstanceWithSecurityGroup(t *testing.T) {
),
},
{
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithSecurityGroup(`[
tencentcloud_security_group.foo.id,
tencentcloud_security_group.bar.id
Expand Down Expand Up @@ -401,6 +417,7 @@ func TestAccTencentCloudInstanceWithTags(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithTags(`{
"hello" = "world"
"happy" = "hour"
Expand All @@ -414,6 +431,7 @@ func TestAccTencentCloudInstanceWithTags(t *testing.T) {
),
},
{
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithTags(`{
"hello" = "hello"
}`),
Expand All @@ -439,7 +457,8 @@ func TestAccTencentCloudInstanceWithPlacementGroup(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithPlacementGroup,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithPlacementGroup,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudInstanceExists(id),
resource.TestCheckResourceAttr(id, "instance_status", "RUNNING"),
Expand All @@ -461,7 +480,8 @@ func TestAccTencentCloudInstanceWithSpotpaid(t *testing.T) {
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstanceWithSpotpaid,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_COMMON) },
Config: testAccTencentCloudInstanceWithSpotpaid,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand All @@ -473,25 +493,26 @@ func TestAccTencentCloudInstanceWithSpotpaid(t *testing.T) {
}

func TestAccTencentCloudInstancePostpaidToPrepaid(t *testing.T) {
t.Parallel()

id := "tencentcloud_instance.foo"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
PreCheck: func() { testAccPreCheck(t) },
IDRefreshName: id,
Providers: testAccProviders,
CheckDestroy: testAccCheckInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccTencentCloudInstancePostPaid,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
Config: testAccTencentCloudInstancePostPaid,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
resource.TestCheckResourceAttr(id, "instance_status", "RUNNING"),
),
},
{
Config: testAccTencentCloudInstanceBasicToPrepaid,
PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
Config: testAccTencentCloudInstanceBasicToPrepaid,
Check: resource.ComposeTestCheckFunc(
testAccCheckTencentCloudDataSourceID(id),
testAccCheckTencentCloudInstanceExists(id),
Expand Down Expand Up @@ -591,8 +612,8 @@ data "tencentcloud_instance_types" "default" {
values = ["S1"]
}

cpu_core_count = 1
memory_size = 1
cpu_core_count = 2
memory_size = 2
}

resource "tencentcloud_instance" "foo" {
Expand All @@ -601,6 +622,7 @@ resource "tencentcloud_instance" "foo" {
image_id = "` + defaultTkeOSImageId + `"
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
system_disk_type = "CLOUD_PREMIUM"
force_delete = true
}
`

Expand All @@ -611,8 +633,8 @@ data "tencentcloud_instance_types" "default" {
values = ["S1"]
}

cpu_core_count = 1
memory_size = 1
cpu_core_count = 2
memory_size = 2
}

resource "tencentcloud_instance" "foo" {
Expand All @@ -624,6 +646,7 @@ resource "tencentcloud_instance" "foo" {
instance_charge_type = "PREPAID"
instance_charge_type_prepaid_period = 1
instance_charge_type_prepaid_renew_flag = "NOTIFY_AND_MANUAL_RENEW"
force_delete = true
}
`

Expand Down Expand Up @@ -796,7 +819,6 @@ resource "tencentcloud_instance" "foo" {
const testAccTencentCloudInstanceWithImageLogin = defaultInstanceVariable + `
data "tencentcloud_images" "zoo" {
image_type = ["PRIVATE_IMAGE"]
os_name = "centos"
}
resource "tencentcloud_instance" "foo" {
instance_name = var.instance_name
Expand Down