Skip to content

Commit

Permalink
Use correct prefix for acceptance tests on AWS (databricks#1487)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexott authored Jul 25, 2022
1 parent 77f554c commit bd9afcf
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion aws/acceptance/instance_profile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
)

func TestAwsAccGroupInstanceProfileResource(t *testing.T) {
func TestAccAwsGroupInstanceProfileResource(t *testing.T) {
if _, ok := os.LookupEnv("CLOUD_ENV"); !ok {
t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")
}
Expand Down
4 changes: 2 additions & 2 deletions aws/resource_instance_profile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func TestResourceInstanceProfileDelete_Error(t *testing.T) {
assert.Equal(t, "arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile", d.Id())
}

func TestAwsAccInstanceProfiles(t *testing.T) {
func TestAccAwsInstanceProfiles(t *testing.T) {
arn := qa.GetEnvOrSkipTest(t, "TEST_EC2_INSTANCE_PROFILE")
client := common.NewClientFromEnvironment()
ctx := context.WithValue(context.Background(), common.Current, t.Name())
Expand All @@ -204,7 +204,7 @@ func TestAwsAccInstanceProfiles(t *testing.T) {
})
}

func TestAwsAccInstanceProfilesSkippingValidation(t *testing.T) {
func TestAccAwsInstanceProfilesSkippingValidation(t *testing.T) {
arn := qa.GetEnvOrSkipTest(t, "TEST_EC2_INSTANCE_PROFILE")
client := common.NewClientFromEnvironment()
ctx := context.WithValue(context.Background(), common.Current, t.Name())
Expand Down
2 changes: 1 addition & 1 deletion clusters/clusters_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ func TestPermanentDelete_Pinned(t *testing.T) {
require.NoError(t, err)
}

func TestAwsAccSmallestNodeType(t *testing.T) {
func TestAccAwsSmallestNodeType(t *testing.T) {
cloudEnv := os.Getenv("CLOUD_ENV")
if cloudEnv == "" {
t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")
Expand Down
4 changes: 2 additions & 2 deletions jobs/acceptance/job_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/stretchr/testify/require"
)

func TestAwsAccJobsCreate(t *testing.T) {
func TestAccAwsJobsCreate(t *testing.T) {
if _, ok := os.LookupEnv("CLOUD_ENV"); !ok {
t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")
}
Expand Down Expand Up @@ -230,7 +230,7 @@ func TestAccJobResource(t *testing.T) {
})
}

func TestAwsAccJobResource_NoInstancePool(t *testing.T) {
func TestAccAwsJobResource_NoInstancePool(t *testing.T) {
if _, ok := os.LookupEnv("CLOUD_ENV"); !ok {
t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")
}
Expand Down
6 changes: 3 additions & 3 deletions storage/acceptance/aws_s3_mount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func getRunningClusterWithInstanceProfile(t *testing.T, client *common.Databrick
})
}

func TestAwsAccS3IamMount_WithCluster(t *testing.T) {
func TestAccAwsS3IamMount_WithCluster(t *testing.T) {
client := common.NewClientFromEnvironment()
arn := qa.GetEnvOrSkipTest(t, "TEST_EC2_INSTANCE_PROFILE")
ctx := context.WithValue(context.Background(), common.Current, t.Name())
Expand Down Expand Up @@ -83,7 +83,7 @@ func TestAwsAccS3IamMount_WithCluster(t *testing.T) {
})
}

func TestAwsAccS3IamMount_NoClusterGiven(t *testing.T) {
func TestAccAwsS3IamMount_NoClusterGiven(t *testing.T) {
client := common.NewClientFromEnvironment()
arn := qa.GetEnvOrSkipTest(t, "TEST_EC2_INSTANCE_PROFILE")
ctx := context.WithValue(context.Background(), common.Current, t.Name())
Expand Down Expand Up @@ -138,7 +138,7 @@ func TestAwsAccS3IamMount_NoClusterGiven(t *testing.T) {
})
}

func TestAwsAccS3Mount(t *testing.T) {
func TestAccAwsS3Mount(t *testing.T) {
client := common.NewClientFromEnvironment()
instanceProfile := qa.GetEnvOrSkipTest(t, "TEST_EC2_INSTANCE_PROFILE")
ctx := context.WithValue(context.Background(), common.Current, t.Name())
Expand Down
2 changes: 1 addition & 1 deletion storage/acceptance/mount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
)

func TestAwsAccS3MountGeneric(t *testing.T) {
func TestAccAwsS3MountGeneric(t *testing.T) {
client := common.NewClientFromEnvironment()
instanceProfile := qa.GetEnvOrSkipTest(t, "TEST_EC2_INSTANCE_PROFILE")
ctx := context.WithValue(context.Background(), common.Current, t.Name())
Expand Down
2 changes: 1 addition & 1 deletion tokens/acceptance/obo_token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
)

func TestAwsAccOboTokenResource(t *testing.T) {
func TestAccAwsOboTokenResource(t *testing.T) {
acceptance.Test(t, []acceptance.Step{
{
Template: `
Expand Down
2 changes: 1 addition & 1 deletion tokens/resource_obo_token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require"
)

func TestAwsAccOboFlow(t *testing.T) {
func TestAccAwsOboFlow(t *testing.T) {
if _, ok := os.LookupEnv("CLOUD_ENV"); !ok {
t.Skip("Acceptance tests skipped unless env 'CLOUD_ENV' is set")
}
Expand Down

0 comments on commit bd9afcf

Please sign in to comment.