From 88ab2c8d7af000582e8416de87b0adc5e3571077 Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Mon, 2 Mar 2020 14:13:54 -0500
Subject: [PATCH] e2e: avoid parsing Args in pkg init

Golang 1.13 introduced a change in test flag parsing:

> testing
> ...
> Testing flags are now registered in the new Init function, which is invoked by the generated main function for the test. As a result, testing flags are now only registered when running a test binary, and packages that call flag.Parse during package initialization may cause tests to fail.

https://golang.org/doc/go1.13#testing

Here, we ensure that e2e framework parsing occur in TestMain, by only
initializing Framework at Run invocation.
---
 e2e/framework/framework.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/e2e/framework/framework.go b/e2e/framework/framework.go
index 25ab1c001..8edc693e8 100644
--- a/e2e/framework/framework.go
+++ b/e2e/framework/framework.go
@@ -93,8 +93,6 @@ var fArch = flag.String("env.arch", "",
 var fTags = flag.String("env.tags", "",
 	"comma delimited list of tags associated with the environment")
 
-var pkgFramework = New()
-
 type Framework struct {
 	suites      []*TestSuite
 	provisioner provisioning.Provisioner
@@ -157,10 +155,11 @@ func (f *Framework) AddSuites(s ...*TestSuite) *Framework {
 	return f
 }
 
+var pkgSuites []*TestSuite
+
 // AddSuites adds a set of test suites to the package scoped Framework
-func AddSuites(s ...*TestSuite) *Framework {
-	pkgFramework.AddSuites(s...)
-	return pkgFramework
+func AddSuites(s ...*TestSuite) {
+	pkgSuites = append(pkgSuites, s...)
 }
 
 // Run starts the test framework, running each TestSuite
@@ -191,7 +190,9 @@ func (f *Framework) Run(t *testing.T) {
 
 // Run starts the package scoped Framework, running each TestSuite
 func Run(t *testing.T) {
-	pkgFramework.Run(t)
+	f := New()
+	f.AddSuites(pkgSuites...)
+	f.Run(t)
 }
 
 // runSuite is called from Framework.Run inside of a sub test for each TestSuite.