From bba8a79a520b38b084234e1990a46d44070a4b38 Mon Sep 17 00:00:00 2001
From: Paul Hinze <phinze@phinze.com>
Date: Wed, 10 Feb 2016 10:20:27 -0600
Subject: [PATCH] acctests: log a line w/ the non-empty plan

Helpful when iterating on a drift test.

Eventually I think this assertion could be fanned out to something much
more targeted like:

    ExpectAttributeDiff(resource, attr, oldval, newval)

But this is a step in the right direction.
---
 helper/resource/testing.go | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/helper/resource/testing.go b/helper/resource/testing.go
index d94dcde98..c2e50bdeb 100644
--- a/helper/resource/testing.go
+++ b/helper/resource/testing.go
@@ -281,9 +281,13 @@ func testStep(
 	if p, err = ctx.Plan(); err != nil {
 		return state, fmt.Errorf("Error on follow-up plan: %s", err)
 	}
-	if p.Diff != nil && !p.Diff.Empty() && !step.ExpectNonEmptyPlan {
-		return state, fmt.Errorf(
-			"After applying this step, the plan was not empty:\n\n%s", p)
+	if p.Diff != nil && !p.Diff.Empty() {
+		if step.ExpectNonEmptyPlan {
+			log.Printf("[INFO] Got non-empty plan, as expected:\n\n%s", p)
+		} else {
+			return state, fmt.Errorf(
+				"After applying this step, the plan was not empty:\n\n%s", p)
+		}
 	}
 
 	// And another after a Refresh.
@@ -295,9 +299,14 @@ func testStep(
 	if p, err = ctx.Plan(); err != nil {
 		return state, fmt.Errorf("Error on second follow-up plan: %s", err)
 	}
-	if p.Diff != nil && !p.Diff.Empty() && !step.ExpectNonEmptyPlan {
-		return state, fmt.Errorf(
-			"After applying this step and refreshing, the plan was not empty:\n\n%s", p)
+	if p.Diff != nil && !p.Diff.Empty() {
+		if step.ExpectNonEmptyPlan {
+			log.Printf("[INFO] Got non-empty plan, as expected:\n\n%s", p)
+		} else {
+			return state, fmt.Errorf(
+				"After applying this step and refreshing, "+
+					"the plan was not empty:\n\n%s", p)
+		}
 	}
 
 	// Made it here, but expected a non-empty plan, fail!