From 968e7f8a4b6a0f5ab7523eea7a2eb299640fd2d7 Mon Sep 17 00:00:00 2001
From: James Phillips <slackpad@gmail.com>
Date: Thu, 21 Sep 2017 14:10:57 -0500
Subject: [PATCH] Fixes TestACL_Version8.

---
 agent/acl_test.go | 58 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/agent/acl_test.go b/agent/acl_test.go
index e2640b9d7276..ff45cec00d47 100644
--- a/agent/acl_test.go
+++ b/agent/acl_test.go
@@ -51,25 +51,53 @@ func (m *MockServer) GetPolicy(args *structs.ACLPolicyRequest, reply *structs.AC
 
 func TestACL_Version8(t *testing.T) {
 	t.Parallel()
-	a := NewTestAgent(t.Name(), `
+
+	t.Run("version 8 disabled", func(t *testing.T) {
+		a := NewTestAgent(t.Name(), TestACLConfig()+`
+ 		acl_enforce_version_8 = false
+ 	`)
+		defer a.Shutdown()
+
+		m := MockServer{
+			getPolicyFn: func(*structs.ACLPolicyRequest, *structs.ACLPolicy) error {
+				t.Fatalf("should not have called to server")
+				return nil
+			},
+		}
+		if err := a.registerEndpoint("ACL", &m); err != nil {
+			t.Fatalf("err: %v", err)
+		}
+
+		if token, err := a.resolveToken("nope"); token != nil || err != nil {
+			t.Fatalf("bad: %v err: %v", token, err)
+		}
+	})
+
+	t.Run("version 8 enabled", func(t *testing.T) {
+		a := NewTestAgent(t.Name(), TestACLConfig()+`
  		acl_enforce_version_8 = true
  	`)
-	defer a.Shutdown()
+		defer a.Shutdown()
 
-	m := MockServer{
-		// With version 8 enforcement off, this should not get called.
-		getPolicyFn: func(*structs.ACLPolicyRequest, *structs.ACLPolicy) error {
-			t.Fatalf("should not have called to server")
-			return nil
-		},
-	}
-	if err := a.registerEndpoint("ACL", &m); err != nil {
-		t.Fatalf("err: %v", err)
-	}
+		var called bool
+		m := MockServer{
+			getPolicyFn: func(*structs.ACLPolicyRequest, *structs.ACLPolicy) error {
+				called = true
+				return fmt.Errorf("token not found")
+			},
+		}
+		if err := a.registerEndpoint("ACL", &m); err != nil {
+			t.Fatalf("err: %v", err)
+		}
 
-	if token, err := a.resolveToken("nope"); token != nil || err != nil {
-		t.Fatalf("bad: %v err: %v", token, err)
-	}
+		if _, err := a.resolveToken("nope"); err != nil {
+			t.Fatalf("err: %v", err)
+		}
+
+		if !called {
+			t.Fatalf("bad")
+		}
+	})
 }
 
 func TestACL_Disabled(t *testing.T) {