From 0fcc417ddd089e8db7386a0bfe720fa1ceee9116 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 22 Feb 2015 11:13:21 -0800 Subject: [PATCH] command/apply: remove remote package --- command/apply_test.go | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/command/apply_test.go b/command/apply_test.go index 0506b49d67..23638fc722 100644 --- a/command/apply_test.go +++ b/command/apply_test.go @@ -15,7 +15,6 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/remote" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" ) @@ -408,8 +407,9 @@ func TestApply_plan_remoteState(t *testing.T) { defer func() { test = true }() tmp, cwd := testCwd(t) defer testFixCwd(t, tmp, cwd) - if err := remote.EnsureDirectory(); err != nil { - t.Fatalf("err: %v", err) + remoteStatePath := filepath.Join(tmp, DefaultDataDir, DefaultStateFilename) + if err := os.MkdirAll(filepath.Dir(remoteStatePath), 0755); err != nil { + t.Fatalf("err: %s", err) } // Set some default reader/writers for the inputs @@ -448,21 +448,13 @@ func TestApply_plan_remoteState(t *testing.T) { } // State file should be not be installed - exists, err := remote.ExistsFile(DefaultStateFilename) - if err != nil { - t.Fatalf("err: %v", err) - } - if exists { + if _, err := os.Stat(filepath.Join(tmp, DefaultStateFilename)); err == nil { t.Fatalf("State path should not exist") } // Check for remote state - output, _, err := remote.ReadLocalState() - if err != nil { - t.Fatalf("err: %v", err) - } - if output == nil { - t.Fatalf("missing remote state") + if _, err := os.Stat(remoteStatePath); err != nil { + t.Fatalf("missing remote state: %s", err) } }