Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e2e: turn no-ACLs connect tests back on #7060

Merged
merged 1 commit into from
Feb 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions e2e/connect/acls.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package connect

import (
"fmt"
"os"
"regexp"
"strings"
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions e2e/connect/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down