github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8457 from davidopp/master

Browse Source 
Fix stylistic isues with #5547. Closes #4910.
This commit is contained in:
Brian Grant
2015-05-19 07:43:21 -07:00
parent 10339d72b6 44b1e1ca0c
commit 2c81050e6f
9 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/scheduler_test.go
View File

@@ -142,7 +142,7 @@ func DoTestUnschedulableNodes(t *testing.T, restClient *client.Client, nodeStore
Spec: api.NodeSpec{Unschedulable: false},
Status: api.NodeStatus{
Capacity: api.ResourceList{
"maxpods": *resource.NewQuantity(32, resource.DecimalSI),
api.ResourcePods: *resource.NewQuantity(32, resource.DecimalSI),
},
Conditions: []api.NodeCondition{goodCondition},
},
@@ -195,7 +195,7 @@ func DoTestUnschedulableNodes(t *testing.T, restClient *client.Client, nodeStore
makeUnSchedulable: func(t *testing.T, n *api.Node, s cache.Store, c *client.Client) {
n.Status = api.NodeStatus{
Capacity: api.ResourceList{
"maxpods": *resource.NewQuantity(32, resource.DecimalSI),
api.ResourcePods: *resource.NewQuantity(32, resource.DecimalSI),
},
Conditions: []api.NodeCondition{badCondition},
}
@@ -212,7 +212,7 @@ func DoTestUnschedulableNodes(t *testing.T, restClient *client.Client, nodeStore
makeSchedulable: func(t *testing.T, n *api.Node, s cache.Store, c *client.Client) {
n.Status = api.NodeStatus{
Capacity: api.ResourceList{
"maxpods": *resource.NewQuantity(32, resource.DecimalSI),
api.ResourcePods: *resource.NewQuantity(32, resource.DecimalSI),
},
Conditions: []api.NodeCondition{goodCondition},
}