command/push: make test more resilient

This commit is contained in:
Mitchell Hashimoto 2016-08-26 13:38:02 -07:00
parent 2eeaac03c5
commit 475d8750bb
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
2 changed files with 17 additions and 2 deletions

View File

@ -6,6 +6,7 @@ import (
"compress/gzip" "compress/gzip"
"io" "io"
"os" "os"
"path/filepath"
"reflect" "reflect"
"sort" "sort"
"testing" "testing"
@ -91,11 +92,26 @@ func TestPush_noUploadModules(t *testing.T) {
// Path of the test. We have to do some renaming to avoid our own // Path of the test. We have to do some renaming to avoid our own
// VCS getting in the way. // VCS getting in the way.
path := testFixturePath("push-no-upload") path := testFixturePath("push-no-upload")
defer testRename(t, path, "DOTterraform", ".terraform")() defer os.RemoveAll(filepath.Join(path, ".terraform"))
// Move into that directory // Move into that directory
defer testChdir(t, path)() defer testChdir(t, path)()
// Do a "terraform get"
{
ui := new(cli.MockUi)
c := &GetCommand{
Meta: Meta{
ContextOpts: testCtxConfig(testProvider()),
Ui: ui,
},
}
if code := c.Run([]string{}); code != 0 {
t.Fatalf("bad: \n%s", ui.ErrorWriter.String())
}
}
// Create remote state file, this should be pulled // Create remote state file, this should be pulled
conf, srv := testRemoteState(t, testState(), 200) conf, srv := testRemoteState(t, testState(), 200)
defer srv.Close() defer srv.Close()