From a3e4b3e966f8c6994a9879586f6c236856d333ac Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 12 Feb 2015 20:06:42 -0800
Subject: [PATCH] terraform: more apply tests

---
 terraform/context_old_test.go | 2 ++
 terraform/context_test.go     | 6 +++---
 terraform/terraform_test.go   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/terraform/context_old_test.go b/terraform/context_old_test.go
index 6bae0fdca..89942d60f 100644
--- a/terraform/context_old_test.go
+++ b/terraform/context_old_test.go
@@ -1219,6 +1219,7 @@ func TestContextApply_countDecrease(t *testing.T) {
 	}
 }
 
+/*
 func TestContextApply_countDecreaseToOne(t *testing.T) {
 	m := testModule(t, "apply-count-dec-one")
 	p := testProvider("aws")
@@ -1277,6 +1278,7 @@ func TestContextApply_countDecreaseToOne(t *testing.T) {
 		t.Fatalf("bad: \n%s", actual)
 	}
 }
+*/
 
 func TestContextApply_countTainted(t *testing.T) {
 	m := testModule(t, "apply-count-tainted")
diff --git a/terraform/context_test.go b/terraform/context_test.go
index 6c3917f2a..06c9c040e 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -3015,8 +3015,7 @@ func TestContext2Apply_countDecrease(t *testing.T) {
 	}
 }
 
-/*
-func TestContextApply_countDecreaseToOne(t *testing.T) {
+func TestContext2Apply_countDecreaseToOne(t *testing.T) {
 	m := testModule(t, "apply-count-dec-one")
 	p := testProvider("aws")
 	p.DiffFn = testDiffFn
@@ -3051,7 +3050,7 @@ func TestContextApply_countDecreaseToOne(t *testing.T) {
 			},
 		},
 	}
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -3075,6 +3074,7 @@ func TestContextApply_countDecreaseToOne(t *testing.T) {
 	}
 }
 
+/*
 func TestContextApply_countTainted(t *testing.T) {
 	m := testModule(t, "apply-count-tainted")
 	p := testProvider("aws")
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index cede986f8..d6d8a305b 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -233,7 +233,7 @@ aws_instance.foo.1:
 `
 
 const testTerraformApplyCountDecToOneStr = `
-aws_instance.foo.0:
+aws_instance.foo:
   ID = bar
   foo = foo
   type = aws_instance