kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix up tests to intantiate assertion test helper

Browse Source 
add http tests for remaining contexts
This commit is contained in:
Chelsea Holland Komlo
2017-08-04 19:28:12 +00:00
parent 96a1723479
commit 971183d6ec
2 changed files with 176 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
command/agent/resources_endpoint_test.go
View File

@@ -7,36 +7,37 @@ import (
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/stretchr/testify/assert"
a "github.com/stretchr/testify/assert"
)
func TestHTTP_ResourcesWithIllegalMethod(t *testing.T) {
assert := a.New(t)
t.Parallel()
httpTest(t, nil, func(s *TestAgent) {
req, err := http.NewRequest("DELETE", "/v1/resources", nil)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
respW := httptest.NewRecorder()
_, err = s.Server.ResourcesRequest(respW, req)
assert.NotNil(t, err, "HTTP DELETE should not be accepted for this endpoint")
assert.NotNil(err, "HTTP DELETE should not be accepted for this endpoint")
})
}
func createJobForTest(jobID string, s *TestAgent, t *testing.T) {
assert := a.New(t)
job := mock.Job()
job.ID = jobID
job.TaskGroups[0].Count = 1
state := s.Agent.server.State()
err := state.UpsertJob(1000, job)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
}
func TestHTTP_Resources_POST(t *testing.T) {
assert := a.New(t)
testJob := "aaaaaaaa-e8f7-fd38-c855-ab94ceb89706"
testJobPrefix := "aaaaaaaa-e8f7-fd38"
t.Parallel()
@@ -45,32 +46,30 @@ func TestHTTP_Resources_POST(t *testing.T) {
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "jobs"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
assert.Nil(err)
if err != nil {
t.Fatalf("err: %v", err)
}
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
assert.Equal(t, 1, len(res.Matches))
assert.Equal(1, len(res.Matches))
j := res.Matches["jobs"]
assert.Equal(t, 1, len(j))
assert.Equal(t, j[0], testJob)
assert.Equal(1, len(j))
assert.Equal(j[0], testJob)
assert.Equal(t, res.Truncations["job"], false)
assert.NotEqual(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
assert.Equal(res.Truncations["job"], false)
assert.NotEqual("0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_Resources_PUT(t *testing.T) {
assert := a.New(t)
testJob := "aaaaaaaa-e8f7-fd38-c855-ab94ceb89706"
testJobPrefix := "aaaaaaaa-e8f7-fd38"
t.Parallel()
@@ -79,32 +78,30 @@ func TestHTTP_Resources_PUT(t *testing.T) {
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "jobs"}
req, err := http.NewRequest("PUT", "/v1/resources", encodeReq(data))
assert.Nil(err)
if err != nil {
t.Fatalf("err: %v", err)
}
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
assert.Equal(t, 1, len(res.Matches))
assert.Equal(1, len(res.Matches))
j := res.Matches["jobs"]
assert.Equal(t, 1, len(j))
assert.Equal(t, j[0], testJob)
assert.Equal(1, len(j))
assert.Equal(j[0], testJob)
assert.Equal(t, res.Truncations["job"], false)
assert.NotEqual(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
assert.Equal(res.Truncations["job"], false)
assert.NotEqual("0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_Resources_MultipleJobs(t *testing.T) {
assert := a.New(t)
testJobA := "aaaaaaaa-e8f7-fd38-c855-ab94ceb89706"
testJobB := "aaaaaaaa-e8f7-fd38-c855-ab94ceb89707"
testJobC := "bbbbbbbb-e8f7-fd38-c855-ab94ceb89707"
@@ -119,34 +116,32 @@ func TestHTTP_Resources_MultipleJobs(t *testing.T) {
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "jobs"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
assert.Nil(err)
if err != nil {
t.Fatalf("err: %v", err)
}
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
assert.Equal(t, 1, len(res.Matches))
assert.Equal(1, len(res.Matches))
j := res.Matches["jobs"]
assert.Equal(t, 2, len(j))
assert.Contains(t, j, testJobA)
assert.Contains(t, j, testJobB)
assert.NotContains(t, j, testJobC)
assert.Equal(2, len(j))
assert.Contains(j, testJobA)
assert.Contains(j, testJobB)
assert.NotContains(j, testJobC)
assert.Equal(t, res.Truncations["job"], false)
assert.NotEqual(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
assert.Equal(res.Truncations["job"], false)
assert.NotEqual("0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_ResoucesList_Evaluation(t *testing.T) {
assert := a.New(t)
t.Parallel()
httpTest(t, nil, func(s *TestAgent) {
state := s.Agent.server.State()
@@ -154,63 +149,124 @@ func TestHTTP_ResoucesList_Evaluation(t *testing.T) {
eval2 := mock.Eval()
err := state.UpsertEvals(9000,
[]*structs.Evaluation{eval1, eval2})
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
prefix := eval1.ID[:len(eval1.ID)-2]
data := structs.ResourcesRequest{Prefix: prefix, Context: "evals"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
assert.Equal(t, 1, len(res.Matches))
assert.Equal(1, len(res.Matches))
j := res.Matches["evals"]
assert.Equal(t, 1, len(j))
assert.Contains(t, j, eval1.ID)
assert.NotContains(t, j, eval2.ID)
assert.Equal(1, len(j))
assert.Contains(j, eval1.ID)
assert.NotContains(j, eval2.ID)
assert.Equal(t, res.Truncations["evals"], false)
assert.Equal(t, "9000", respW.HeaderMap.Get("X-Nomad-Index"))
assert.Equal(res.Truncations["evals"], false)
assert.Equal("9000", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_ResoucesList_Allocations(t *testing.T) {
assert := a.New(t)
t.Parallel()
httpTest(t, nil, func(s *TestAgent) {
state := s.Agent.server.State()
alloc := mock.Alloc()
err := state.UpsertAllocs(7000, []*structs.Allocation{alloc})
assert.Nil(err)
prefix := alloc.ID[:len(alloc.ID)-2]
data := structs.ResourcesRequest{Prefix: prefix, Context: "allocs"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
assert.Nil(err)
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
assert.Equal(1, len(res.Matches))
a := res.Matches["allocs"]
assert.Equal(1, len(a))
assert.Contains(a, alloc.ID)
assert.Equal(res.Truncations["allocs"], false)
assert.Equal("7000", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_ResoucesList_Nodes(t *testing.T) {
assert := a.New(t)
t.Parallel()
httpTest(t, nil, func(s *TestAgent) {
state := s.Agent.server.State()
node := mock.Node()
err := state.UpsertNode(6000, node)
assert.Nil(err)
prefix := node.ID[:len(node.ID)-2]
data := structs.ResourcesRequest{Prefix: prefix, Context: "nodes"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
assert.Nil(err)
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
assert.Equal(1, len(res.Matches))
n := res.Matches["nodes"]
assert.Equal(1, len(n))
assert.Contains(n, node.ID)
assert.Equal(res.Truncations["nodes"], false)
assert.Equal("6000", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_Resources_NoJob(t *testing.T) {
assert := a.New(t)
t.Parallel()
httpTest(t, nil, func(s *TestAgent) {
data := structs.ResourcesRequest{Prefix: "12345", Context: "jobs"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
assert.Nil(err)
if err != nil {
t.Fatalf("err: %v", err)
}
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
assert.Equal(t, 1, len(res.Matches))
assert.Equal(t, 0, len(res.Matches["jobs"]))
assert.Equal(1, len(res.Matches))
assert.Equal(0, len(res.Matches["jobs"]))
assert.Equal(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
assert.Equal("0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_Resources_NoContext(t *testing.T) {
assert := a.New(t)
testJobID := "aaaaaaaa-e8f7-fd38-c855-ab94ceb89706"
testJobPrefix := "aaaaaaaa-e8f7-fd38"
t.Parallel()
@@ -222,32 +278,26 @@ func TestHTTP_Resources_NoContext(t *testing.T) {
eval1.ID = testJobID
err := state.UpsertEvals(9000,
[]*structs.Evaluation{eval1})
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
data := structs.ResourcesRequest{Prefix: testJobPrefix}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
assert.Nil(err)
if err != nil {
t.Fatalf("err: %v", err)
}
respW := httptest.NewRecorder()
resp, err := s.Server.ResourcesRequest(respW, req)
if err != nil {
t.Fatalf("err: %v", err)
}
assert.Nil(err)
res := resp.(structs.ResourcesResponse)
matchedJobs := res.Matches["jobs"]
matchedEvals := res.Matches["evals"]
assert.Equal(t, 1, len(matchedJobs))
assert.Equal(t, 1, len(matchedEvals))
assert.Equal(1, len(matchedJobs))
assert.Equal(1, len(matchedEvals))
assert.Equal(t, matchedJobs[0], testJobID)
assert.Equal(t, matchedEvals[0], eval1.ID)
assert.Equal(matchedJobs[0], testJobID)
assert.Equal(matchedEvals[0], eval1.ID)
})
}

81
nomad/resources_endpoint_test.go
View File

@@ -17,8 +17,7 @@ func registerAndVerifyJob(s *Server, t *testing.T, prefix string, counter int) s
job.ID = prefix + strconv.Itoa(counter)
state := s.fsm.State()
err := state.UpsertJob(jobIndex, job)
if err != nil {
if err := state.UpsertJob(jobIndex, job); err != nil {
t.Fatalf("err: %v", err)
}
@@ -26,6 +25,7 @@ func registerAndVerifyJob(s *Server, t *testing.T, prefix string, counter int) s
}
func TestResourcesEndpoint_List(t *testing.T) {
assert := assert.New(t)
prefix := "aaaaaaaa-e8f7-fd38-c855-ab94ceb8970"
t.Parallel()
@@ -49,13 +49,14 @@ func TestResourcesEndpoint_List(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 1, len(resp.Matches["jobs"]))
assert.Equal(t, jobID, resp.Matches["jobs"][0])
assert.Equal(t, uint64(jobIndex), resp.Index)
assert.Equal(1, len(resp.Matches["jobs"]))
assert.Equal(jobID, resp.Matches["jobs"][0])
assert.Equal(uint64(jobIndex), resp.Index)
}
// truncate should limit results to 20
func TestResourcesEndpoint_List_Truncate(t *testing.T) {
assert := assert.New(t)
prefix := "aaaaaaaa-e8f7-fd38-c855-ab94ceb8970"
t.Parallel()
@@ -81,12 +82,13 @@ func TestResourcesEndpoint_List_Truncate(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 20, len(resp.Matches["jobs"]))
assert.Equal(t, resp.Truncations["jobs"], true)
assert.Equal(t, uint64(jobIndex), resp.Index)
assert.Equal(20, len(resp.Matches["jobs"]))
assert.Equal(resp.Truncations["jobs"], true)
assert.Equal(uint64(jobIndex), resp.Index)
}
func TestResourcesEndpoint_List_Evals(t *testing.T) {
assert := assert.New(t)
t.Parallel()
s := testServer(t, func(c *Config) {
c.NumSchedulers = 0
@@ -111,14 +113,15 @@ func TestResourcesEndpoint_List_Evals(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 1, len(resp.Matches["evals"]))
assert.Equal(t, eval1.ID, resp.Matches["evals"][0])
assert.Equal(t, resp.Truncations["evals"], false)
assert.Equal(1, len(resp.Matches["evals"]))
assert.Equal(eval1.ID, resp.Matches["evals"][0])
assert.Equal(resp.Truncations["evals"], false)
assert.Equal(t, uint64(2000), resp.Index)
assert.Equal(uint64(2000), resp.Index)
}
func TestResourcesEndpoint_List_Allocation(t *testing.T) {
assert := assert.New(t)
t.Parallel()
s := testServer(t, func(c *Config) {
c.NumSchedulers = 0
@@ -151,14 +154,15 @@ func TestResourcesEndpoint_List_Allocation(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 1, len(resp.Matches["allocs"]))
assert.Equal(t, alloc.ID, resp.Matches["allocs"][0])
assert.Equal(t, resp.Truncations["allocs"], false)
assert.Equal(1, len(resp.Matches["allocs"]))
assert.Equal(alloc.ID, resp.Matches["allocs"][0])
assert.Equal(resp.Truncations["allocs"], false)
assert.Equal(t, uint64(90), resp.Index)
assert.Equal(uint64(90), resp.Index)
}
func TestResourcesEndpoint_List_Node(t *testing.T) {
assert := assert.New(t)
t.Parallel()
s := testServer(t, func(c *Config) {
c.NumSchedulers = 0
@@ -187,14 +191,16 @@ func TestResourcesEndpoint_List_Node(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 1, len(resp.Matches["nodes"]))
assert.Equal(t, node.ID, resp.Matches["nodes"][0])
assert.Equal(t, false, resp.Truncations["nodes"])
assert.Equal(1, len(resp.Matches["nodes"]))
assert.Equal(node.ID, resp.Matches["nodes"][0])
assert.Equal(false, resp.Truncations["nodes"])
assert.Equal(t, uint64(100), resp.Index)
assert.Equal(uint64(100), resp.Index)
}
func TestResourcesEndpoint_List_InvalidContext(t *testing.T) {
assert := assert.New(t)
t.Parallel()
s := testServer(t, func(c *Config) {
c.NumSchedulers = 0
@@ -211,12 +217,13 @@ func TestResourcesEndpoint_List_InvalidContext(t *testing.T) {
var resp structs.ResourcesResponse
err := msgpackrpc.CallWithCodec(codec, "Resources.List", req, &resp)
assert.Equal(t, err.Error(), "invalid context")
assert.Equal(err.Error(), "invalid context")
assert.Equal(t, uint64(0), resp.Index)
assert.Equal(uint64(0), resp.Index)
}
func TestResourcesEndpoint_List_NoContext(t *testing.T) {
assert := assert.New(t)
t.Parallel()
s := testServer(t, func(c *Config) {
c.NumSchedulers = 0
@@ -251,17 +258,19 @@ func TestResourcesEndpoint_List_NoContext(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 1, len(resp.Matches["nodes"]))
assert.Equal(t, 1, len(resp.Matches["evals"]))
assert.Equal(1, len(resp.Matches["nodes"]))
assert.Equal(1, len(resp.Matches["evals"]))
assert.Equal(t, node.ID, resp.Matches["nodes"][0])
assert.Equal(t, eval1.ID, resp.Matches["evals"][0])
assert.Equal(node.ID, resp.Matches["nodes"][0])
assert.Equal(eval1.ID, resp.Matches["evals"][0])
assert.NotEqual(t, uint64(0), resp.Index)
assert.NotEqual(uint64(0), resp.Index)
}
// Tests that the top 20 matches are returned when no prefix is set
//// Tests that the top 20 matches are returned when no prefix is set
func TestResourcesEndpoint_List_NoPrefix(t *testing.T) {
assert := assert.New(t)
prefix := "aaaaaaaa-e8f7-fd38-c855-ab94ceb8970"
t.Parallel()
@@ -285,14 +294,16 @@ func TestResourcesEndpoint_List_NoPrefix(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 1, len(resp.Matches["jobs"]))
assert.Equal(t, jobID, resp.Matches["jobs"][0])
assert.Equal(t, uint64(jobIndex), resp.Index)
assert.Equal(1, len(resp.Matches["jobs"]))
assert.Equal(jobID, resp.Matches["jobs"][0])
assert.Equal(uint64(jobIndex), resp.Index)
}
// Tests that the zero matches are returned when a prefix has no matching
// results
//// Tests that the zero matches are returned when a prefix has no matching
//// results
func TestResourcesEndpoint_List_NoMatches(t *testing.T) {
assert := assert.New(t)
prefix := "aaaaaaaa-e8f7-fd38-c855-ab94ceb8970"
t.Parallel()
@@ -314,6 +325,6 @@ func TestResourcesEndpoint_List_NoMatches(t *testing.T) {
t.Fatalf("err: %v", err)
}
assert.Equal(t, 0, len(resp.Matches["jobs"]))
assert.Equal(t, uint64(0), resp.Index)
assert.Equal(0, len(resp.Matches["jobs"]))
assert.Equal(uint64(0), resp.Index)
}