From 14b59424539680b668b620ff3139576107a9a28d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 13 Feb 2015 18:01:32 -0800
Subject: [PATCH] terraform: all input tests pass

---
 terraform/context_test.go | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/terraform/context_test.go b/terraform/context_test.go
index 0715c1d69..bba98b291 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -2463,14 +2463,13 @@ func TestContext2Input_provider(t *testing.T) {
 	}
 }
 
-/*
-func TestContextInput_providerId(t *testing.T) {
+func TestContext2Input_providerId(t *testing.T) {
 	input := new(MockUIInput)
 	m := testModule(t, "input-provider")
 	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),
@@ -2514,13 +2513,13 @@ func TestContextInput_providerId(t *testing.T) {
 	}
 }
 
-func TestContextInput_providerOnly(t *testing.T) {
+func TestContext2Input_providerOnly(t *testing.T) {
 	input := new(MockUIInput)
 	m := testModule(t, "input-provider-vars")
 	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),
@@ -2569,13 +2568,13 @@ func TestContextInput_providerOnly(t *testing.T) {
 	}
 }
 
-func TestContextInput_providerVars(t *testing.T) {
+func TestContext2Input_providerVars(t *testing.T) {
 	input := new(MockUIInput)
 	m := testModule(t, "input-provider-with-vars")
 	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),
@@ -2617,13 +2616,13 @@ func TestContextInput_providerVars(t *testing.T) {
 	}
 }
 
-func TestContextInput_varOnly(t *testing.T) {
+func TestContext2Input_varOnly(t *testing.T) {
 	input := new(MockUIInput)
 	m := testModule(t, "input-provider-vars")
 	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),
@@ -2671,7 +2670,6 @@ func TestContextInput_varOnly(t *testing.T) {
 		t.Fatalf("bad: \n%s", actualStr)
 	}
 }
-*/
 
 func TestContext2Apply(t *testing.T) {
 	m := testModule(t, "apply-good")