From 88d819428e2cef900aa810334c99350bf90869b1 Mon Sep 17 00:00:00 2001
From: Yusuke Kuoka <ykuoka@gmail.com>
Date: Wed, 23 Sep 2020 22:25:12 +0900
Subject: [PATCH] Fix failing test whose result was dependent on some container
 image repo contents

---
 examples/module/Dockerfile          |  2 +-
 examples/module/default.variantmod  |  2 +-
 examples/module/module_test.variant |  4 ++--
 main_test.go                        | 20 ++++++++++++++------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/examples/module/Dockerfile b/examples/module/Dockerfile
index 7e7ae05..a272deb 100644
--- a/examples/module/Dockerfile
+++ b/examples/module/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.10
 
-ARG HELM_VERSION=3.0.0
+ARG HELM_VERSION=3.2.0
 ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
 
 ADD http://storage.googleapis.com/kubernetes-helm/${HELM_FILE_NAME} /tmp
diff --git a/examples/module/default.variantmod b/examples/module/default.variantmod
index f5f4c66..9c225a2 100644
--- a/examples/module/default.variantmod
+++ b/examples/module/default.variantmod
@@ -1,7 +1,7 @@
 module "default" {
   dependency "github_release" "helm" {
     source = "helm/helm"
-    version = "> 1.0.0, < 3.0.1"
+    version = ">= 3.0.0, < 3.2.1"
   }
 
   file "Dockerfile" {
diff --git a/examples/module/module_test.variant b/examples/module/module_test.variant
index 633b154..db600c4 100644
--- a/examples/module/module_test.variant
+++ b/examples/module/module_test.variant
@@ -2,7 +2,7 @@
 test "test" {
   case "ok" {
     out = trimspace(<<EOS
-version.BuildInfo{Version:"v3.0.0", GitCommit:"e29ce2a54e96cd02ccfce88bee4f58bb6e2a28b6", GitTreeState:"clean", GoVersion:"go1.13.4"}
+version.BuildInfo{Version:"v3.2.0", GitCommit:"e11b7ce3b12db2941e90399e874513fbd24bcb71", GitTreeState:"clean", GoVersion:"go1.13.10"}
 EOS
     )
     exitstatus = 0
@@ -25,7 +25,7 @@ test "build" {
     out = trimspace(<<EOS
 FROM alpine:3.10
 
-ARG HELM_VERSION=3.0.0
+ARG HELM_VERSION=3.2.0
 ARG HELM_FILENAME="helm-$${HELM_VERSION}-linux-amd64.tar.gz"
 
 ADD http://storage.googleapis.com/kubernetes-helm/$${HELM_FILE_NAME} /tmp
diff --git a/main_test.go b/main_test.go
index d396fec..42e086a 100644
--- a/main_test.go
+++ b/main_test.go
@@ -224,6 +224,7 @@ func TestExamples(t *testing.T) {
 			t.Logf("Running subtest: %d %s", i, tc.subject)
 
 			outRead, outWrite := io.Pipe()
+			errRead, errWrite := io.Pipe()
 			env := Env{
 				Args: tc.args,
 				Getenv: func(name string) string {
@@ -248,27 +249,34 @@ func TestExamples(t *testing.T) {
 			go func() {
 				err = RunMain(env, func(m *Main) {
 					m.Stdout = outWrite
-					m.Stderr = os.Stderr
+					m.Stderr = errWrite
 					m.Getenv = env.Getenv
 					m.Getwd = env.Getwd
 				})
 				outWrite.Close()
+				errWrite.Close()
 			}()
 
-			buf := new(bytes.Buffer)
-			if _, err := buf.ReadFrom(outRead); err != nil {
+			outBuf := new(bytes.Buffer)
+			if _, err := outBuf.ReadFrom(outRead); err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
-			out := buf.String()
+			out := outBuf.String()
+
+			errBuf := new(bytes.Buffer)
+			if _, err := errBuf.ReadFrom(errRead); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			errOut := errBuf.String()
 
 			if tc.expectErr != "" {
 				if err == nil {
 					t.Fatalf("Expected error didn't occur")
 				} else if err.Error() != tc.expectErr {
-					t.Fatalf("Unexpected error: want %q, got %q", tc.expectErr, err.Error())
+					t.Fatalf("Unexpected error: want %q, got %q\n%s", tc.expectErr, err.Error(), errOut)
 				}
 			} else if err != nil {
-				t.Fatalf("%+v", err)
+				t.Fatalf("%+v\n%s", err, errOut)
 			}
 
 			if tc.expectOut != "" {