Merge pull request #125 from yunify/add-test-tag

Add test tag
yunify · Dec 22, 2017 · 48a396e · 48a396e
2 parents a58b1e4 + 9201bc3
commit 48a396e
Show file tree

Hide file tree

Showing 17 changed files with 325 additions and 67 deletions.
diff --git a/qingcloud/import_qingcloud_eip_test.go b/qingcloud/import_qingcloud_eip_test.go
@@ -1,21 +1,24 @@
 package qingcloud
 
 import (
+	"os"
 	"testing"
 
+	"fmt"
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
 func TestAccQingcloudEip_importBasic(t *testing.T) {
 	resourceName := "qingcloud_eip.foo"
+	testTag := "terraform-test-eip-import-basic" + os.Getenv("CIRCLE_BUILD_NUM")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckEIPDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccEIPConfigTwo,
+				Config: fmt.Sprintf(testAccEIPConfigTwo, testTag),
 			},
 
 			resource.TestStep{

diff --git a/qingcloud/import_qingcloud_instance_test.go b/qingcloud/import_qingcloud_instance_test.go
@@ -1,20 +1,24 @@
 package qingcloud
 
 import (
-	"github.com/hashicorp/terraform/helper/resource"
+	"fmt"
+	"os"
 	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
 )
 
 func TestAccQingcloudInstance_importBasic(t *testing.T) {
 	resourceName := "qingcloud_instance.foo"
+	testTag := "terraform-test-instance-import-basic" + os.Getenv("CIRCLE_BUILD_NUM")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckInstanceDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccInstanceConfigKeyPair,
+				Config: fmt.Sprintf(testAccInstanceConfig, testTag),
 			},
 
 			resource.TestStep{

diff --git a/qingcloud/import_qingcloud_keypair_test.go b/qingcloud/import_qingcloud_keypair_test.go
@@ -1,20 +1,24 @@
 package qingcloud
 
 import (
-	"github.com/hashicorp/terraform/helper/resource"
+	"fmt"
+	"os"
 	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
 )
 
 func TestAccQingcloudKeyPair_importBasic(t *testing.T) {
 	resourceName := "qingcloud_keypair.foo"
+	testTag := "terraform-test-kepair-import-basic" + os.Getenv("CIRCLE_BUILD_NUM")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckKeypairDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccKeypairConfigTwo,
+				Config: fmt.Sprintf(testAccKeypairConfigTwo, testTag),
 			},
 
 			resource.TestStep{

diff --git a/qingcloud/import_qingcloud_tag_test.go b/qingcloud/import_qingcloud_tag_test.go
@@ -10,15 +10,15 @@ import (
 
 func TestAccQingcloudTag_importBasic(t *testing.T) {
 	resourceName := "qingcloud_tag.foo"
-	Tag1Name := os.Getenv("TRAVIS_BUILD_ID") + "-" + os.Getenv("TRAVIS_JOB_NUMBER") + "-tag1"
+	tagName := os.Getenv("CIRCLE_BUILD_NUM") + "-tag-import"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckTagDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: fmt.Sprintf(testAccTagConfigTempalte, Tag1Name),
+				Config: fmt.Sprintf(testAccTagConfigTempalte, tagName),
 			},
 
 			resource.TestStep{

diff --git a/qingcloud/import_qingcloud_volume_test.go b/qingcloud/import_qingcloud_volume_test.go
@@ -1,21 +1,24 @@
 package qingcloud
 
 import (
+	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
 func TestAccQingcloudVolume_importBasic(t *testing.T) {
 	resourceName := "qingcloud_volume.foo"
+	testTag := "terraform-test-volume-import-basic" + os.Getenv("CIRCLE_BUILD_NUM")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckVolumeDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccVolumeConfigTwo,
+				Config: fmt.Sprintf(testAccVolumeConfigTwo, testTag),
 			},
 			resource.TestStep{
 				ResourceName:      resourceName,

diff --git a/qingcloud/import_qingcloud_vxnet_test.go b/qingcloud/import_qingcloud_vxnet_test.go
@@ -3,19 +3,22 @@ package qingcloud
 import (
 	"testing"
 
+	"fmt"
 	"github.com/hashicorp/terraform/helper/resource"
+	"os"
 )
 
 func TestAccQingcloudVxnet_importBasic(t *testing.T) {
 	resourceName := "qingcloud_vxnet.foo"
+	testTag := "terraform-test-vxnet-import-basic" + os.Getenv("CIRCLE_BUILD_NUM")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckVxNetDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccVxNetConfigThree,
+				Config: fmt.Sprintf(testAccVxNetConfigThree, testTag),
 			},
 			resource.TestStep{
 				ResourceName:      resourceName,

diff --git a/qingcloud/resource_qingcloud_eip_test.go b/qingcloud/resource_qingcloud_eip_test.go
@@ -27,6 +27,7 @@ import (
 
 func TestAccQingcloudEIP_basic(t *testing.T) {
 	var eip qc.DescribeEIPsOutput
+	testTag := "terraform-test-eip-basic" + os.Getenv("CIRCLE_BUILD_NUM")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
@@ -39,7 +40,7 @@ func TestAccQingcloudEIP_basic(t *testing.T) {
 		CheckDestroy:  testAccCheckEIPDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccEIPConfig,
+				Config: fmt.Sprintf(testAccEIPConfig, testTag),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckEIPExists(
 						"qingcloud_eip.foo", &eip),
@@ -56,7 +57,7 @@ func TestAccQingcloudEIP_basic(t *testing.T) {
 				),
 			},
 			resource.TestStep{
-				Config: testAccEIPConfigTwo,
+				Config: fmt.Sprintf(testAccEIPConfigTwo, testTag),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckEIPExists(
 						"qingcloud_eip.foo", &eip),
@@ -76,6 +77,7 @@ func TestAccQingcloudEIP_basic(t *testing.T) {
 	})
 
 }
+
 func TestAccQingcloudEIP_tag(t *testing.T) {
 	var eip qc.DescribeEIPsOutput
 	eipTag1Name := "terraform-" + os.Getenv("CIRCLE_BUILD_NUM") + "-eip-tag1"
@@ -197,15 +199,25 @@ resource "qingcloud_eip" "foo" {
     billing_mode = "traffic"
     bandwidth = 2
     need_icp = 0
-} `
+	tag_ids = ["${qingcloud_tag.test.id}"]
+}
+resource "qingcloud_tag" "test"{
+	name="%v"
+}
+`
 const testAccEIPConfigTwo = `
 resource "qingcloud_eip" "foo" {
     name = "eip"
     description = "eip"
     billing_mode = "bandwidth"
     bandwidth = 4
     need_icp = 0
-} `
+	tag_ids = ["${qingcloud_tag.test.id}"]
+}
+resource "qingcloud_tag" "test"{
+	name="%v"
+}
+`
 
 const testAccEipConfigTagTemplate = `