From a2ee80402d720e2310939f0a29f4402c98604fcb Mon Sep 17 00:00:00 2001
From: Seth Hoenig <shoenig@hashicorp.com>
Date: Mon, 3 Feb 2020 20:46:33 -0600
Subject: [PATCH] e2e: turn no-ACLs connect tests back on

Also cleanup more missed debugging things >.>
---
 e2e/connect/acls.go    | 12 ------------
 e2e/connect/connect.go | 18 +++++++++---------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/e2e/connect/acls.go b/e2e/connect/acls.go
index 7be3128fd..bfbcfd5d0 100644
--- a/e2e/connect/acls.go
+++ b/e2e/connect/acls.go
@@ -1,7 +1,6 @@
 package connect
 
 import (
-	"fmt"
 	"os"
 	"regexp"
 	"strings"
@@ -194,7 +193,6 @@ func (tc *ConnectACLsE2ETest) TestConnectACLsRegisterMasterToken(f *framework.F)
 	resp, _, err := jobAPI.Plan(job, false, nil)
 	r.NoError(err)
 	r.NotNil(resp)
-	fmt.Println("resp:", resp)
 }
 
 func (tc *ConnectACLsE2ETest) TestConnectACLsRegisterMissingOperatorToken(f *framework.F) {
@@ -265,18 +263,10 @@ func (tc *ConnectACLsE2ETest) TestConnectACLsConnectDemo(f *framework.F) {
 
 	// === Register the Nomad job ===
 	jobID := "connectACL_connect_demo"
-	//{
-	//
-	//	nomadClient := tc.Nomad()
-	//	allocs := e2eutil.RegisterAndWaitForAllocs(t, nomadClient, demoConnectJob, jobID, operatorToken)
-	//	allocIDs := e2eutil.AllocIDsFromAllocationListStubs(allocs)
-	//	e2eutil.WaitForAllocsRunning(t, nomadClient, allocIDs)
-	//}
 
 	var allocs []*napi.AllocationListStub
 	allocIDs := make(map[string]bool, 2)
 	{
-		// jobID := "connect" + uuid.Generate()[0:8] (nicer name now)
 
 		// parse the example connect jobspec file
 		tc.jobIDs = append(tc.jobIDs, jobID)
@@ -318,8 +308,6 @@ func (tc *ConnectACLsE2ETest) TestConnectACLsConnectDemo(f *framework.F) {
 		r.Len(eval.QueuedAllocations, 2, pretty.Sprint(eval.QueuedAllocations))
 
 		// === Assert allocs are running ===
-		// var allocs []*napi.AllocationListStub // move scope
-
 		for i := 0; i < 20; i++ {
 			allocs, qMeta, err = evalAPI.Allocations(eval.ID, qOpts)
 			r.NoError(err)
diff --git a/e2e/connect/connect.go b/e2e/connect/connect.go
index 44e54bbbf..3acd43139 100644
--- a/e2e/connect/connect.go
+++ b/e2e/connect/connect.go
@@ -22,15 +22,15 @@ type ConnectE2ETest struct {
 
 func init() {
 	// connect tests without Consul ACLs enabled
-	//framework.AddSuites(&framework.TestSuite{
-	//	Component:   "Connect",
-	//	CanRunLocal: true,
-	//	Consul:      true,
-	//	Cases: []framework.TestCase{
-	//		new(ConnectE2ETest),
-	//		new(ConnectClientStateE2ETest),
-	//	},
-	//})
+	framework.AddSuites(&framework.TestSuite{
+		Component:   "Connect",
+		CanRunLocal: true,
+		Consul:      true,
+		Cases: []framework.TestCase{
+			new(ConnectE2ETest),
+			new(ConnectClientStateE2ETest),
+		},
+	})
 
 	// connect tests with Consul ACLs enabled
 	framework.AddSuites(&framework.TestSuite{