Skip to content

Commit

Permalink
Standardise directory name for test data
Browse files Browse the repository at this point in the history
  • Loading branch information
@radeksimko
radeksimko committed Jun 30, 2019
1 parent 805ae28 commit 5b9f2fa
Show file tree
Hide file tree
Showing 1,431 changed files with 224 additions and 225 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ website/node_modules
website/vendor

# Test exclusions
!command/test-fixtures/**/*.tfstate
!command/test-fixtures/**/.terraform/
!command/testdata/**/*.tfstate
!command/testdata/**/.terraform/
12 changes: 6 additions & 6 deletions backend/local/backend_apply_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestLocal_applyBasic(t *testing.T) {
"ami": cty.StringVal("bar"),
})}

op, configCleanup := testOperationApply(t, "./test-fixtures/apply")
op, configCleanup := testOperationApply(t, "./testdata/apply")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -71,7 +71,7 @@ func TestLocal_applyEmptyDir(t *testing.T) {
p := TestLocalProvider(t, b, "test", &terraform.ProviderSchema{})
p.ApplyResourceChangeResponse = providers.ApplyResourceChangeResponse{NewState: cty.ObjectVal(map[string]cty.Value{"id": cty.StringVal("yes")})}

op, configCleanup := testOperationApply(t, "./test-fixtures/empty")
op, configCleanup := testOperationApply(t, "./testdata/empty")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -99,7 +99,7 @@ func TestLocal_applyEmptyDirDestroy(t *testing.T) {
p := TestLocalProvider(t, b, "test", &terraform.ProviderSchema{})
p.ApplyResourceChangeResponse = providers.ApplyResourceChangeResponse{}

op, configCleanup := testOperationApply(t, "./test-fixtures/empty")
op, configCleanup := testOperationApply(t, "./testdata/empty")
defer configCleanup()
op.Destroy = true

Expand Down Expand Up @@ -161,7 +161,7 @@ func TestLocal_applyError(t *testing.T) {
}
}

op, configCleanup := testOperationApply(t, "./test-fixtures/apply-error")
op, configCleanup := testOperationApply(t, "./testdata/apply-error")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -201,7 +201,7 @@ func TestLocal_applyBackendFail(t *testing.T) {
}
defer os.Chdir(wd)

op, configCleanup := testOperationApply(t, wd+"/test-fixtures/apply")
op, configCleanup := testOperationApply(t, wd+"/testdata/apply")
defer configCleanup()

b.Backend = &backendWithFailingState{}
Expand Down Expand Up @@ -282,7 +282,7 @@ func testApplyState() *terraform.State {
}

// applyFixtureSchema returns a schema suitable for processing the
// configuration in test-fixtures/apply . This schema should be
// configuration in testdata/apply . This schema should be
// assigned to a mock provider named "test".
func applyFixtureSchema() *terraform.ProviderSchema {
return &terraform.ProviderSchema{
Expand Down
26 changes: 13 additions & 13 deletions backend/local/backend_plan_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestLocal_planBasic(t *testing.T) {
defer cleanup()
p := TestLocalProvider(t, b, "test", planFixtureSchema())

op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()
op.PlanRefresh = true

Expand Down Expand Up @@ -59,7 +59,7 @@ func TestLocal_planInAutomation(t *testing.T) {
b.RunningInAutomation = false
b.CLI = cli.NewMockUi()
{
op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()
op.PlanRefresh = true

Expand All @@ -83,7 +83,7 @@ func TestLocal_planInAutomation(t *testing.T) {
b.RunningInAutomation = true
b.CLI = cli.NewMockUi()
{
op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()
op.PlanRefresh = true

Expand Down Expand Up @@ -111,7 +111,7 @@ func TestLocal_planNoConfig(t *testing.T) {

b.CLI = cli.NewMockUi()

op, configCleanup := testOperationPlan(t, "./test-fixtures/empty")
op, configCleanup := testOperationPlan(t, "./testdata/empty")
defer configCleanup()
op.PlanRefresh = true

Expand Down Expand Up @@ -139,7 +139,7 @@ func TestLocal_planTainted(t *testing.T) {
outDir := testTempDir(t)
defer os.RemoveAll(outDir)
planPath := filepath.Join(outDir, "plan.tfplan")
op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()
op.PlanRefresh = true
op.PlanOutPath = planPath
Expand Down Expand Up @@ -224,7 +224,7 @@ func TestLocal_planDeposedOnly(t *testing.T) {
outDir := testTempDir(t)
defer os.RemoveAll(outDir)
planPath := filepath.Join(outDir, "plan.tfplan")
op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()
op.PlanRefresh = true
op.PlanOutPath = planPath
Expand Down Expand Up @@ -317,7 +317,7 @@ func TestLocal_planTainted_createBeforeDestroy(t *testing.T) {
outDir := testTempDir(t)
defer os.RemoveAll(outDir)
planPath := filepath.Join(outDir, "plan.tfplan")
op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-cbd")
op, configCleanup := testOperationPlan(t, "./testdata/plan-cbd")
defer configCleanup()
op.PlanRefresh = true
op.PlanOutPath = planPath
Expand Down Expand Up @@ -378,7 +378,7 @@ func TestLocal_planRefreshFalse(t *testing.T) {
p := TestLocalProvider(t, b, "test", planFixtureSchema())
testStateFile(t, b.StatePath, testPlanState())

op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -410,7 +410,7 @@ func TestLocal_planDestroy(t *testing.T) {
defer os.RemoveAll(outDir)
planPath := filepath.Join(outDir, "plan.tfplan")

op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()
op.Destroy = true
op.PlanRefresh = true
Expand Down Expand Up @@ -466,7 +466,7 @@ func TestLocal_planDestroy_withDataSources(t *testing.T) {
defer os.RemoveAll(outDir)
planPath := filepath.Join(outDir, "plan.tfplan")

op, configCleanup := testOperationPlan(t, "./test-fixtures/destroy-with-ds")
op, configCleanup := testOperationPlan(t, "./testdata/destroy-with-ds")
defer configCleanup()
op.Destroy = true
op.PlanRefresh = true
Expand Down Expand Up @@ -551,7 +551,7 @@ func TestLocal_planOutPathNoChange(t *testing.T) {
defer os.RemoveAll(outDir)
planPath := filepath.Join(outDir, "plan.tfplan")

op, configCleanup := testOperationPlan(t, "./test-fixtures/plan")
op, configCleanup := testOperationPlan(t, "./testdata/plan")
defer configCleanup()
op.PlanOutPath = planPath
cfg := cty.ObjectVal(map[string]cty.Value{
Expand Down Expand Up @@ -601,7 +601,7 @@ func TestLocal_planScaleOutNoDupeCount(t *testing.T) {
outDir := testTempDir(t)
defer os.RemoveAll(outDir)

op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-scaleout")
op, configCleanup := testOperationPlan(t, "./testdata/plan-scaleout")
defer configCleanup()
op.PlanRefresh = true

Expand Down Expand Up @@ -751,7 +751,7 @@ func testReadPlan(t *testing.T, path string) *plans.Plan {
}

// planFixtureSchema returns a schema suitable for processing the
// configuration in test-fixtures/plan . This schema should be
// configuration in testdata/plan . This schema should be
// assigned to a mock provider named "test".
func planFixtureSchema() *terraform.ProviderSchema {
return &terraform.ProviderSchema{
Expand Down
12 changes: 6 additions & 6 deletions backend/local/backend_refresh_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestLocal_refresh(t *testing.T) {
"id": cty.StringVal("yes"),
})}

op, configCleanup := testOperationRefresh(t, "./test-fixtures/refresh")
op, configCleanup := testOperationRefresh(t, "./testdata/refresh")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -56,7 +56,7 @@ func TestLocal_refreshNoConfig(t *testing.T) {
"id": cty.StringVal("yes"),
})}

op, configCleanup := testOperationRefresh(t, "./test-fixtures/empty")
op, configCleanup := testOperationRefresh(t, "./testdata/empty")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -89,7 +89,7 @@ func TestLocal_refreshNilModuleWithInput(t *testing.T) {

b.OpInput = true

op, configCleanup := testOperationRefresh(t, "./test-fixtures/empty")
op, configCleanup := testOperationRefresh(t, "./testdata/empty")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -146,7 +146,7 @@ func TestLocal_refreshInput(t *testing.T) {
b.OpInput = true
b.ContextOpts.UIInput = &terraform.MockUIInput{InputReturnString: "bar"}

op, configCleanup := testOperationRefresh(t, "./test-fixtures/refresh-var-unset")
op, configCleanup := testOperationRefresh(t, "./testdata/refresh-var-unset")
defer configCleanup()
op.UIIn = b.ContextOpts.UIInput

Expand Down Expand Up @@ -180,7 +180,7 @@ func TestLocal_refreshValidate(t *testing.T) {
// Enable validation
b.OpValidation = true

op, configCleanup := testOperationRefresh(t, "./test-fixtures/refresh")
op, configCleanup := testOperationRefresh(t, "./testdata/refresh")
defer configCleanup()

run, err := b.Operation(context.Background(), op)
Expand Down Expand Up @@ -234,7 +234,7 @@ func testRefreshState() *terraform.State {
}

// refreshFixtureSchema returns a schema suitable for processing the
// configuration in test-fixtures/refresh . This schema should be
// configuration in testdata/refresh . This schema should be
// assigned to a mock provider named "test".
func refreshFixtureSchema() *terraform.ProviderSchema {
return &terraform.ProviderSchema{
Expand Down
0 ...local/test-fixtures/apply-empty/hello.txt → backend/local/testdata/apply-empty/hello.txt
View file
File renamed without changes.
0 ...d/local/test-fixtures/apply-error/main.tf → backend/local/testdata/apply-error/main.tf
View file
File renamed without changes.
0 backend/local/test-fixtures/apply/main.tf → backend/local/testdata/apply/main.tf
View file
File renamed without changes.
0 ...cal/test-fixtures/destroy-with-ds/main.tf → ...nd/local/testdata/destroy-with-ds/main.tf
View file
File renamed without changes.
0 backend/local/test-fixtures/empty/.gitignore → backend/local/testdata/empty/.gitignore
View file
File renamed without changes.
0 backend/local/test-fixtures/plan-cbd/main.tf → backend/local/testdata/plan-cbd/main.tf
View file
File renamed without changes.
0 ...local/test-fixtures/plan-scaleout/main.tf → backend/local/testdata/plan-scaleout/main.tf
View file
File renamed without changes.
0 backend/local/test-fixtures/plan/main.tf → backend/local/testdata/plan/main.tf
View file
File renamed without changes.
0 ...l/test-fixtures/refresh-var-unset/main.tf → .../local/testdata/refresh-var-unset/main.tf
View file
File renamed without changes.
0 backend/local/test-fixtures/refresh/main.tf → backend/local/testdata/refresh/main.tf
View file
File renamed without changes.
Loading

0 comments on commit 5b9f2fa

Please sign in to comment.