github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

renaming PodSelector to LabelSelector

Browse Source
This commit is contained in:
Salvatore Dario Minonne
2015-12-01 10:24:21 +01:00
parent a5100ef057
commit 80575c3093
32 changed files with 409 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/apis/extensions/helpers_test.go
View File

@@ -23,11 +23,11 @@ import (
"k8s.io/kubernetes/pkg/labels"
)
func TestPodSelectorAsSelector(t *testing.T) {
func TestLabelSelectorAsSelector(t *testing.T) {
matchLabels := map[string]string{"foo": "bar"}
matchExpressions := []PodSelectorRequirement{{
matchExpressions := []LabelSelectorRequirement{{
Key: "baz",
Operator: PodSelectorOpIn,
Operator: LabelSelectorOpIn,
Values: []string{"qux", "norf"},
}}
mustParse := func(s string) labels.Selector {
@@ -38,29 +38,29 @@ func TestPodSelectorAsSelector(t *testing.T) {
return out
}
tc := []struct {
in *PodSelector
in *LabelSelector
out labels.Selector
expectErr bool
}{
{in: nil, out: labels.Nothing()},
{in: &PodSelector{}, out: labels.Everything()},
{in: &LabelSelector{}, out: labels.Everything()},
{
in: &PodSelector{MatchLabels: matchLabels},
in: &LabelSelector{MatchLabels: matchLabels},
out: mustParse("foo in (bar)"),
},
{
in: &PodSelector{MatchExpressions: matchExpressions},
in: &LabelSelector{MatchExpressions: matchExpressions},
out: mustParse("baz in (norf,qux)"),
},
{
in: &PodSelector{MatchLabels: matchLabels, MatchExpressions: matchExpressions},
in: &LabelSelector{MatchLabels: matchLabels, MatchExpressions: matchExpressions},
out: mustParse("foo in (bar),baz in (norf,qux)"),
},
{
in: &PodSelector{
MatchExpressions: []PodSelectorRequirement{{
in: &LabelSelector{
MatchExpressions: []LabelSelectorRequirement{{
Key: "baz",
Operator: PodSelectorOpExists,
Operator: LabelSelectorOpExists,
Values: []string{"qux", "norf"},
}},
},
@@ -69,7 +69,7 @@ func TestPodSelectorAsSelector(t *testing.T) {
}
for i, tc := range tc {
out, err := PodSelectorAsSelector(tc.in)
out, err := LabelSelectorAsSelector(tc.in)
if err == nil && tc.expectErr {
t.Errorf("[%v]expected error but got none.", i)
}