Merge pull request #4247 from hashicorp/b-destroy-check-state

testing: Use a copy of pre-destroy state in destroy check
This commit is contained in:
James Nugent 2015-12-10 13:22:07 -05:00
commit 7f734d58cd
1 changed files with 13 additions and 2 deletions

View File

@ -247,6 +247,11 @@ func testStep(
log.Printf("[WARN] Test: Step plan: %s", p) log.Printf("[WARN] Test: Step plan: %s", p)
} }
// We need to keep a copy of the state prior to destroying
// such that destroy steps can verify their behaviour in the check
// function
stateBeforeApplication := state.DeepCopy()
// Apply! // Apply!
state, err = ctx.Apply() state, err = ctx.Apply()
if err != nil { if err != nil {
@ -255,10 +260,16 @@ func testStep(
// Check! Excitement! // Check! Excitement!
if step.Check != nil { if step.Check != nil {
if step.Destroy {
if err := step.Check(stateBeforeApplication); err != nil {
return state, fmt.Errorf("Check failed: %s", err)
}
} else {
if err := step.Check(state); err != nil { if err := step.Check(state); err != nil {
return state, fmt.Errorf("Check failed: %s", err) return state, fmt.Errorf("Check failed: %s", err)
} }
} }
}
// Now, verify that Plan is now empty and we don't have a perpetual diff issue // Now, verify that Plan is now empty and we don't have a perpetual diff issue
// We do this with TWO plans. One without a refresh. // We do this with TWO plans. One without a refresh.