moving ParseSelector to Parse for labels only.

This commit is contained in:
Salvatore Dario Minonne
2015-02-25 17:19:10 +01:00
parent 00989f229c
commit 75f2efb500
12 changed files with 189 additions and 151 deletions

View File

@@ -139,8 +139,10 @@ func (c *testClient) ValidateCommon(t *testing.T, err error) {
validator, ok := c.QueryValidator[key]
if !ok {
switch key {
case "labels", "fields":
case "labels":
validator = validateLabels
case "fields":
validator = validateFields
default:
validator = func(a, b string) bool { return a == b }
}
@@ -227,6 +229,18 @@ func TestListPods(t *testing.T) {
}
func validateLabels(a, b string) bool {
sA, eA := labels.Parse(a)
if eA != nil {
return false
}
sB, eB := labels.Parse(b)
if eB != nil {
return false
}
return sA.String() == sB.String()
}
func validateFields(a, b string) bool {
sA, _ := labels.ParseSelector(a)
sB, _ := labels.ParseSelector(b)
return sA.String() == sB.String()