ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terraform: a lot more passing tests

This commit is contained in:
Mitchell Hashimoto 2015-02-13 12:13:39 -08:00
parent 742b45886a
commit 6bb3cb8f2f
4 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
terraform/context_old_test.go
View File

@ -2213,6 +2213,7 @@ func TestContextApply_destroyTaintedProvisioner(t *testing.T) {
} }
} }
/*
func TestContextApply_error(t *testing.T) { func TestContextApply_error(t *testing.T) {
errored := false errored := false
@ -2338,6 +2339,7 @@ func TestContextApply_errorPartial(t *testing.T) {
t.Fatalf("bad: \n%s", actual) t.Fatalf("bad: \n%s", actual)
} }
} }
*/
func TestContextApply_hook(t *testing.T) { func TestContextApply_hook(t *testing.T) {
m := testModule(t, "apply-good") m := testModule(t, "apply-good")

39
terraform/context_test.go
View File

@ -3844,13 +3844,13 @@ func TestContext2Apply_destroy(t *testing.T) {
} }
/* /*
func TestContextApply_destroyOutputs(t *testing.T) { func TestContext2Apply_destroyOutputs(t *testing.T) {
m := testModule(t, "apply-destroy-outputs") m := testModule(t, "apply-destroy-outputs")
h := new(HookRecordApplyOrder) h := new(HookRecordApplyOrder)
p := testProvider("aws") p := testProvider("aws")
p.ApplyFn = testApplyFn p.ApplyFn = testApplyFn
p.DiffFn = testDiffFn p.DiffFn = testDiffFn
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Hooks: []Hook{h}, Hooks: []Hook{h},
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
@ -3884,8 +3884,9 @@ func TestContextApply_destroyOutputs(t *testing.T) {
t.Fatalf("bad: %#v", mod) t.Fatalf("bad: %#v", mod)
} }
} }
*/
func TestContextApply_destroyOrphan(t *testing.T) { func TestContext2Apply_destroyOrphan(t *testing.T) {
m := testModule(t, "apply-error") m := testModule(t, "apply-error")
p := testProvider("aws") p := testProvider("aws")
s := &State{ s := &State{
@ -3903,7 +3904,7 @@ func TestContextApply_destroyOrphan(t *testing.T) {
}, },
}, },
} }
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p), "aws": testProviderFuncFixed(p),
@ -3945,7 +3946,7 @@ func TestContextApply_destroyOrphan(t *testing.T) {
} }
} }
func TestContextApply_destroyTaintedProvisioner(t *testing.T) { func TestContext2Apply_destroyTaintedProvisioner(t *testing.T) {
m := testModule(t, "apply-destroy-provisioner") m := testModule(t, "apply-destroy-provisioner")
p := testProvider("aws") p := testProvider("aws")
pr := testProvisioner() pr := testProvisioner()
@ -3979,7 +3980,7 @@ func TestContextApply_destroyTaintedProvisioner(t *testing.T) {
}, },
} }
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p), "aws": testProviderFuncFixed(p),
@ -4010,12 +4011,12 @@ func TestContextApply_destroyTaintedProvisioner(t *testing.T) {
} }
} }
func TestContextApply_error(t *testing.T) { func TestContext2Apply_error(t *testing.T) {
errored := false errored := false
m := testModule(t, "apply-error") m := testModule(t, "apply-error")
p := testProvider("aws") p := testProvider("aws")
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p), "aws": testProviderFuncFixed(p),
@ -4064,7 +4065,7 @@ func TestContextApply_error(t *testing.T) {
} }
} }
func TestContextApply_errorPartial(t *testing.T) { func TestContext2Apply_errorPartial(t *testing.T) {
errored := false errored := false
m := testModule(t, "apply-error") m := testModule(t, "apply-error")
@ -4084,7 +4085,7 @@ func TestContextApply_errorPartial(t *testing.T) {
}, },
}, },
} }
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p), "aws": testProviderFuncFixed(p),
@ -4136,13 +4137,13 @@ func TestContextApply_errorPartial(t *testing.T) {
} }
} }
func TestContextApply_hook(t *testing.T) { func TestContext2Apply_hook(t *testing.T) {
m := testModule(t, "apply-good") m := testModule(t, "apply-good")
h := new(MockHook) h := new(MockHook)
p := testProvider("aws") p := testProvider("aws")
p.ApplyFn = testApplyFn p.ApplyFn = testApplyFn
p.DiffFn = testDiffFn p.DiffFn = testDiffFn
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Hooks: []Hook{h}, Hooks: []Hook{h},
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
@ -4166,10 +4167,10 @@ func TestContextApply_hook(t *testing.T) {
} }
} }
func TestContextApply_idAttr(t *testing.T) { func TestContext2Apply_idAttr(t *testing.T) {
m := testModule(t, "apply-idattr") m := testModule(t, "apply-idattr")
p := testProvider("aws") p := testProvider("aws")
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p), "aws": testProviderFuncFixed(p),
@ -4217,12 +4218,12 @@ func TestContextApply_idAttr(t *testing.T) {
} }
} }
func TestContextApply_output(t *testing.T) { func TestContext2Apply_output(t *testing.T) {
m := testModule(t, "apply-output") m := testModule(t, "apply-output")
p := testProvider("aws") p := testProvider("aws")
p.ApplyFn = testApplyFn p.ApplyFn = testApplyFn
p.DiffFn = testDiffFn p.DiffFn = testDiffFn
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p), "aws": testProviderFuncFixed(p),
@ -4245,12 +4246,13 @@ func TestContextApply_output(t *testing.T) {
} }
} }
func TestContextApply_outputInvalid(t *testing.T) { /*
func TestContext2Apply_outputInvalid(t *testing.T) {
m := testModule(t, "apply-output-invalid") m := testModule(t, "apply-output-invalid")
p := testProvider("aws") p := testProvider("aws")
p.ApplyFn = testApplyFn p.ApplyFn = testApplyFn
p.DiffFn = testDiffFn p.DiffFn = testDiffFn
ctx := testContext(t, &ContextOpts{ ctx := testContext2(t, &ContextOpts{
Module: m, Module: m,
Providers: map[string]ResourceProviderFactory{ Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p), "aws": testProviderFuncFixed(p),
@ -4266,6 +4268,7 @@ func TestContextApply_outputInvalid(t *testing.T) {
} }
} }
/*
func TestContextApply_outputList(t *testing.T) { func TestContextApply_outputList(t *testing.T) {
m := testModule(t, "apply-output-list") m := testModule(t, "apply-output-list")
p := testProvider("aws") p := testProvider("aws")

10
terraform/terraform_test.go
View File

@ -337,8 +337,9 @@ const testTerraformApplyDestroyStr = `
` `
const testTerraformApplyErrorStr = ` const testTerraformApplyErrorStr = `
aws_instance.bar: aws_instance.bar: (1 tainted)
ID = bar ID = <not created>
Tainted ID 1 = bar
Dependencies: Dependencies:
aws_instance.foo aws_instance.foo
@ -360,8 +361,9 @@ aws_instance.bar: (1 tainted)
` `
const testTerraformApplyErrorPartialStr = ` const testTerraformApplyErrorPartialStr = `
aws_instance.bar: aws_instance.bar: (1 tainted)
ID = bar ID = <not created>
Tainted ID 1 = bar
Dependencies: Dependencies:
aws_instance.foo aws_instance.foo

2
terraform/transform_resource.go
View File

@ -238,7 +238,7 @@ func (n *graphNodeExpandedResource) EvalTree() EvalNode {
&EvalIf{ &EvalIf{
If: func(ctx EvalContext) (bool, error) { If: func(ctx EvalContext) (bool, error) {
if diffApply == nil { if diffApply == nil {
return true, nil return true, EvalEarlyExitError{}
} }
if diffApply.Destroy { if diffApply.Destroy {