github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: refactor TestAgent_Leave_ACLDeny to use only one server

pull/3027/merge
Frank Schroeder 2017-05-10 09:08:39 +02:00 committed by Frank Schröder
parent a60f508880
commit 5328609d59
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
command/agent/agent_endpoint_test.go
View File

@ -550,40 +550,31 @@ func TestAgent_Leave(t *testing.T) {
} }
func TestAgent_Leave_ACLDeny(t *testing.T) { func TestAgent_Leave_ACLDeny(t *testing.T) {
t.Run("no token", func(t *testing.T) { dir, srv := makeHTTPServerWithACLs(t)
dir, srv := makeHTTPServerWithACLs(t) defer os.RemoveAll(dir)
defer os.RemoveAll(dir) defer srv.Shutdown()
defer srv.Shutdown() defer srv.agent.Shutdown()
defer srv.agent.Shutdown()
t.Run("no token", func(t *testing.T) {
req, _ := http.NewRequest("PUT", "/v1/agent/leave", nil) req, _ := http.NewRequest("PUT", "/v1/agent/leave", nil)
if _, err := srv.AgentLeave(nil, req); !isPermissionDenied(err) { if _, err := srv.AgentLeave(nil, req); !isPermissionDenied(err) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
}) })
t.Run("agent master token", func(t *testing.T) { t.Run("read-only token", func(t *testing.T) {
dir, srv := makeHTTPServerWithACLs(t) ro := makeReadOnlyAgentACL(t, srv)
defer os.RemoveAll(dir) req, _ := http.NewRequest("PUT", fmt.Sprintf("/v1/agent/leave?token=%s", ro), nil)
defer srv.Shutdown() if _, err := srv.AgentLeave(nil, req); !isPermissionDenied(err) {
defer srv.agent.Shutdown()
req, _ := http.NewRequest("PUT", "/v1/agent/leave?token=towel", nil)
if _, err := srv.AgentLeave(nil, req); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
}) })
// this test fails when all subtests share the same server. // this sub-test will change the state so that there is no leader.
t.Run("read-only token", func(t *testing.T) { // it must therefore be the last one in this list.
dir, srv := makeHTTPServerWithACLs(t) t.Run("agent master token", func(t *testing.T) {
defer os.RemoveAll(dir) req, _ := http.NewRequest("PUT", "/v1/agent/leave?token=towel", nil)
defer srv.Shutdown() if _, err := srv.AgentLeave(nil, req); err != nil {
defer srv.agent.Shutdown()
ro := makeReadOnlyAgentACL(t, srv)
req, _ := http.NewRequest("PUT", fmt.Sprintf("/v1/agent/leave?token=%s", ro), nil)
if _, err := srv.AgentLeave(nil, req); !isPermissionDenied(err) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
}) })