From 8eee1dac6d61833de4c5c1f3fa88903d15d0a4de Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Fri, 8 Jun 2018 19:55:39 -0400
Subject: [PATCH] Add a test for nil-ing out request tokenentry

---
 vault/router_test.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/vault/router_test.go b/vault/router_test.go
index 929ece7339..b992419f70 100644
--- a/vault/router_test.go
+++ b/vault/router_test.go
@@ -31,6 +31,10 @@ type NoopBackend struct {
 }
 
 func (n *NoopBackend) HandleRequest(ctx context.Context, req *logical.Request) (*logical.Response, error) {
+	if req.TokenEntry() != nil {
+		panic("got a non-nil TokenEntry")
+	}
+
 	var err error
 	resp := n.Response
 	if n.RequestHandler != nil {
@@ -171,6 +175,9 @@ func TestRouter_Mount(t *testing.T) {
 	req := &logical.Request{
 		Path: "prod/aws/foo",
 	}
+	req.SetTokenEntry(&logical.TokenEntry{
+		ID: "foo",
+	})
 	resp, err := r.Route(context.Background(), req)
 	if err != nil {
 		t.Fatalf("err: %v", err)
@@ -178,6 +185,9 @@ func TestRouter_Mount(t *testing.T) {
 	if resp != nil {
 		t.Fatalf("bad: %v", resp)
 	}
+	if req.TokenEntry() == nil || req.TokenEntry().ID != "foo" {
+		t.Fatalf("unexpected value for token entry: %v", req.TokenEntry())
+	}
 
 	// Verify the path
 	if len(n.Paths) != 1 || n.Paths[0] != "foo" {