From 20b0d9f0601ffd33dbb482aecdbeb3f95e3f53f4 Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Mon, 17 Apr 2017 11:35:56 -0400 Subject: [PATCH] provider/aws: Run AWS Spot Datafeed Subscription tests in serial --- ...ort_aws_spot_datafeed_subscription_test.go | 6 ++--- ...rce_aws_spot_datafeed_subscription_test.go | 22 +++++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/builtin/providers/aws/import_aws_spot_datafeed_subscription_test.go b/builtin/providers/aws/import_aws_spot_datafeed_subscription_test.go index 8d60f39945..24c7acc59f 100644 --- a/builtin/providers/aws/import_aws_spot_datafeed_subscription_test.go +++ b/builtin/providers/aws/import_aws_spot_datafeed_subscription_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" ) -func TestAccAWSSpotDatafeedSubscription_importBasic(t *testing.T) { +func testAccAWSSpotDatafeedSubscription_importBasic(t *testing.T) { resourceName := "aws_spot_datafeed_subscription.default" ri := acctest.RandInt() @@ -16,11 +16,11 @@ func TestAccAWSSpotDatafeedSubscription_importBasic(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckAWSSpotDatafeedSubscriptionDestroy, Steps: []resource.TestStep{ - resource.TestStep{ + { Config: testAccAWSSpotDatafeedSubscription(ri), }, - resource.TestStep{ + { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, diff --git a/builtin/providers/aws/resource_aws_spot_datafeed_subscription_test.go b/builtin/providers/aws/resource_aws_spot_datafeed_subscription_test.go index d12e7e7654..b05c691e89 100644 --- a/builtin/providers/aws/resource_aws_spot_datafeed_subscription_test.go +++ b/builtin/providers/aws/resource_aws_spot_datafeed_subscription_test.go @@ -12,7 +12,21 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSSpotDatafeedSubscription_basic(t *testing.T) { +func TestAccAWSSpotDatafeedSubscription(t *testing.T) { + cases := map[string]func(t *testing.T){ + "basic": testAccAWSSpotDatafeedSubscription_basic, + "disappears": testAccAWSSpotDatafeedSubscription_disappears, + "import": testAccAWSSpotDatafeedSubscription_importBasic, + } + + for name, tc := range cases { + t.Run(name, func(t *testing.T) { + tc(t) + }) + } +} + +func testAccAWSSpotDatafeedSubscription_basic(t *testing.T) { var subscription ec2.SpotDatafeedSubscription ri := acctest.RandInt() @@ -21,7 +35,7 @@ func TestAccAWSSpotDatafeedSubscription_basic(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckAWSSpotDatafeedSubscriptionDestroy, Steps: []resource.TestStep{ - resource.TestStep{ + { Config: testAccAWSSpotDatafeedSubscription(ri), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSpotDatafeedSubscriptionExists("aws_spot_datafeed_subscription.default", &subscription), @@ -55,7 +69,7 @@ func testAccCheckAWSSpotDatafeedSubscriptionDisappears(subscription *ec2.SpotDat } } -func TestAccAWSSpotDatafeedSubscription_disappears(t *testing.T) { +func testAccAWSSpotDatafeedSubscription_disappears(t *testing.T) { var subscription ec2.SpotDatafeedSubscription ri := acctest.RandInt() @@ -64,7 +78,7 @@ func TestAccAWSSpotDatafeedSubscription_disappears(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckAWSSpotDatafeedSubscriptionDestroy, Steps: []resource.TestStep{ - resource.TestStep{ + { Config: testAccAWSSpotDatafeedSubscription(ri), Check: resource.ComposeTestCheckFunc( testAccCheckAWSSpotDatafeedSubscriptionExists("aws_spot_datafeed_subscription.default", &subscription),