Merge pull request #8706 from terraform-providers/t-xray-PreCheck

tests/service/xray: Add PreCheck for service availability
hashicorp · May 24, 2019 · 0574520 · 0574520
2 parents 4a829db + 2351aa4
commit 0574520
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/aws/resource_aws_xray_sampling_rule_test.go b/aws/resource_aws_xray_sampling_rule_test.go
@@ -17,7 +17,7 @@ func TestAccAWSXraySamplingRule_basic(t *testing.T) {
 	ruleName := fmt.Sprintf("tf_acc_sampling_rule_%s", rString)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheck(t); testAccPreCheckAWSXray(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAWSXraySamplingRuleDestroy,
 		Steps: []resource.TestStep{
@@ -57,7 +57,7 @@ func TestAccAWSXraySamplingRule_update(t *testing.T) {
 	updatedReservoirSize := acctest.RandIntRange(0, 2147483647)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheck(t); testAccPreCheckAWSXray(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAWSXraySamplingRuleDestroy,
 		Steps: []resource.TestStep{
@@ -152,6 +152,22 @@ func testAccCheckAWSXraySamplingRuleDestroy(s *terraform.State) error {
 	return nil
 }
 
+func testAccPreCheckAWSXray(t *testing.T) {
+	conn := testAccProvider.Meta().(*AWSClient).xrayconn
+
+	input := &xray.GetSamplingRulesInput{}
+
+	_, err := conn.GetSamplingRules(input)
+
+	if testAccPreCheckSkipError(err) {
+		t.Skipf("skipping acceptance testing: %s", err)
+	}
+
+	if err != nil {
+		t.Fatalf("unexpected PreCheck error: %s", err)
+	}
+}
+
 func testAccAWSXraySamplingRuleConfig_basic(ruleName string) string {
 	return fmt.Sprintf(`
 resource "aws_xray_sampling_rule" "test" {