From d0c77d268a73daf599e0c3b62bc9b7d89d75702b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 13 Feb 2015 08:51:58 -0800
Subject: [PATCH] terraform: more tests passing

---
 terraform/context_test.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/terraform/context_test.go b/terraform/context_test.go
index 71a74f0a8..65efb168a 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -3123,13 +3123,12 @@ func TestContext2Apply_countTainted(t *testing.T) {
 	}
 }
 
-/*
-func TestContextApply_countVariable(t *testing.T) {
+func TestContext2Apply_countVariable(t *testing.T) {
 	m := testModule(t, "apply-count-variable")
 	p := testProvider("aws")
 	p.ApplyFn = testApplyFn
 	p.DiffFn = testDiffFn
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -3152,12 +3151,12 @@ func TestContextApply_countVariable(t *testing.T) {
 	}
 }
 
-func TestContextApply_module(t *testing.T) {
+func TestContext2Apply_module(t *testing.T) {
 	m := testModule(t, "apply-module")
 	p := testProvider("aws")
 	p.ApplyFn = testApplyFn
 	p.DiffFn = testDiffFn
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -3180,12 +3179,12 @@ func TestContextApply_module(t *testing.T) {
 	}
 }
 
-func TestContextApply_nilDiff(t *testing.T) {
+func TestContext2Apply_nilDiff(t *testing.T) {
 	m := testModule(t, "apply-good")
 	p := testProvider("aws")
 	p.ApplyFn = testApplyFn
 	p.DiffFn = testDiffFn
-	ctx := testContext(t, &ContextOpts{
+	ctx := testContext2(t, &ContextOpts{
 		Module: m,
 		Providers: map[string]ResourceProviderFactory{
 			"aws": testProviderFuncFixed(p),
@@ -3205,6 +3204,7 @@ func TestContextApply_nilDiff(t *testing.T) {
 	}
 }
 
+/*
 func TestContextApply_Provisioner_compute(t *testing.T) {
 	m := testModule(t, "apply-provisioner-compute")
 	p := testProvider("aws")