From 4eb1a26568bd0667932f9be76b5a51770754f8a2 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 31 Jul 2019 15:38:01 -0400 Subject: [PATCH 1/2] remove public module from e2etest Public modules aren't likely to stay compatible with 0.11 syntax. Keep the init test rather than disable it, but change it to use a local module. --- command/e2etest/init_test.go | 6 +++--- .../e2etest/test-fixtures/empty/init-from-module/main.tf | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 command/e2etest/test-fixtures/empty/init-from-module/main.tf diff --git a/command/e2etest/init_test.go b/command/e2etest/init_test.go index a80ba7db3c..da4f59b472 100644 --- a/command/e2etest/init_test.go +++ b/command/e2etest/init_test.go @@ -144,7 +144,7 @@ func TestInit_fromModule(t *testing.T) { tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() - cmd := tf.Cmd("init", "-from-module=hashicorp/vault/aws") + cmd := tf.Cmd("init", "-from-module=./init-from-module") cmd.Stdin = nil cmd.Stderr = &bytes.Buffer{} @@ -162,7 +162,7 @@ func TestInit_fromModule(t *testing.T) { if err != nil { t.Fatalf("failed to read main.tf: %s", err) } - if !bytes.Contains(content, []byte("vault")) { - t.Fatalf("main.tf doesn't appear to be a vault configuration: \n%s", content) + if !bytes.Contains(content, []byte("null_resource")) { + t.Fatalf("main.tf doesn't appear to be a null_resource configuration: \n%s", content) } } diff --git a/command/e2etest/test-fixtures/empty/init-from-module/main.tf b/command/e2etest/test-fixtures/empty/init-from-module/main.tf new file mode 100644 index 0000000000..512c9f453f --- /dev/null +++ b/command/e2etest/test-fixtures/empty/init-from-module/main.tf @@ -0,0 +1,6 @@ +resource "null_resource" "test" { +} + +output "output" { + value = "${null_resource.test.id}" +} From c5b3f847e8f29a936b8c34b2467dacc2c21dffa8 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 31 Jul 2019 16:13:53 -0400 Subject: [PATCH 2/2] remote website test from non-master branch --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fb57fbe127..0111899815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,6 @@ script: - make test - make e2etest - GOOS=windows go build -- make website-test branches: only: