mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-10-31 18:28:13 +00:00 
			
		
		
		
	Merge pull request #69537 from logicalhan/index-test
refactor index_test to compress the assertions and make consistent with store_test.go
This commit is contained in:
		| @@ -17,6 +17,7 @@ limitations under the License. | ||||
| package cache | ||||
|  | ||||
| import ( | ||||
| 	"k8s.io/apimachinery/pkg/util/sets" | ||||
| 	"strings" | ||||
| 	"testing" | ||||
|  | ||||
| @@ -70,60 +71,31 @@ func TestMultiIndexKeys(t *testing.T) { | ||||
| 	index.Add(pod2) | ||||
| 	index.Add(pod3) | ||||
|  | ||||
| 	erniePods, err := index.ByIndex("byUser", "ernie") | ||||
| 	if err != nil { | ||||
| 		t.Errorf("unexpected error: %v", err) | ||||
| 	} | ||||
| 	if len(erniePods) != 2 { | ||||
| 		t.Errorf("Expected 2 pods but got %v", len(erniePods)) | ||||
| 	} | ||||
| 	for _, erniePod := range erniePods { | ||||
| 		if erniePod.(*v1.Pod).Name != "one" && erniePod.(*v1.Pod).Name != "tre" { | ||||
| 			t.Errorf("Expected only 'one' or 'tre' but got %s", erniePod.(*v1.Pod).Name) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	bertPods, err := index.ByIndex("byUser", "bert") | ||||
| 	if err != nil { | ||||
| 		t.Errorf("unexpected error: %v", err) | ||||
| 	} | ||||
| 	if len(bertPods) != 2 { | ||||
| 		t.Errorf("Expected 2 pods but got %v", len(bertPods)) | ||||
| 	} | ||||
| 	for _, bertPod := range bertPods { | ||||
| 		if bertPod.(*v1.Pod).Name != "one" && bertPod.(*v1.Pod).Name != "two" { | ||||
| 			t.Errorf("Expected only 'one' or 'two' but got %s", bertPod.(*v1.Pod).Name) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	oscarPods, err := index.ByIndex("byUser", "oscar") | ||||
| 	if err != nil { | ||||
| 		t.Errorf("unexpected error: %v", err) | ||||
| 	} | ||||
| 	if len(oscarPods) != 1 { | ||||
| 		t.Errorf("Expected 1 pods but got %v", len(erniePods)) | ||||
| 	} | ||||
| 	for _, oscarPod := range oscarPods { | ||||
| 		if oscarPod.(*v1.Pod).Name != "two" { | ||||
| 			t.Errorf("Expected only 'two' but got %s", oscarPod.(*v1.Pod).Name) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	ernieAndBertKeys, err := index.Index("byUser", pod1) | ||||
| 	if err != nil { | ||||
| 		t.Errorf("unexpected error: %v", err) | ||||
| 	} | ||||
| 	if len(ernieAndBertKeys) != 3 { | ||||
| 		t.Errorf("Expected 3 pods but got %v", len(ernieAndBertKeys)) | ||||
| 	} | ||||
| 	for _, ernieAndBertKey := range ernieAndBertKeys { | ||||
| 		if ernieAndBertKey.(*v1.Pod).Name != "one" && ernieAndBertKey.(*v1.Pod).Name != "two" && ernieAndBertKey.(*v1.Pod).Name != "tre" { | ||||
| 			t.Errorf("Expected only 'one', 'two' or 'tre' but got %s", ernieAndBertKey.(*v1.Pod).Name) | ||||
| 	expected := map[string]sets.String{} | ||||
| 	expected["ernie"] = sets.NewString("one", "tre") | ||||
| 	expected["bert"] = sets.NewString("one", "two") | ||||
| 	expected["elmo"] = sets.NewString("tre") | ||||
| 	expected["oscar"] = sets.NewString("two") | ||||
| 	expected["elmo"] = sets.NewString() // let's just make sure we don't get anything back in this case | ||||
| 	{ | ||||
| 		for k, v := range expected { | ||||
| 			found := sets.String{} | ||||
| 			indexResults, err := index.ByIndex("byUser", k) | ||||
| 			if err != nil { | ||||
| 				t.Errorf("Unexpected error %v", err) | ||||
| 			} | ||||
| 			for _, item := range indexResults { | ||||
| 				found.Insert(item.(*v1.Pod).Name) | ||||
| 			} | ||||
| 			items := v.List() | ||||
| 			if !found.HasAll(items...) { | ||||
| 				t.Errorf("missing items, index %s, expected %v but found %v", k, items, found.List()) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	index.Delete(pod3) | ||||
| 	erniePods, err = index.ByIndex("byUser", "ernie") | ||||
| 	erniePods, err := index.ByIndex("byUser", "ernie") | ||||
| 	if err != nil { | ||||
| 		t.Errorf("unexpected error: %v", err) | ||||
| 	} | ||||
| @@ -147,7 +119,7 @@ func TestMultiIndexKeys(t *testing.T) { | ||||
| 	copyOfPod2 := pod2.DeepCopy() | ||||
| 	copyOfPod2.Annotations["users"] = "oscar" | ||||
| 	index.Update(copyOfPod2) | ||||
| 	bertPods, err = index.ByIndex("byUser", "bert") | ||||
| 	bertPods, err := index.ByIndex("byUser", "bert") | ||||
| 	if err != nil { | ||||
| 		t.Errorf("unexpected error: %v", err) | ||||
| 	} | ||||
| @@ -159,5 +131,4 @@ func TestMultiIndexKeys(t *testing.T) { | ||||
| 			t.Errorf("Expected only 'one' but got %s", bertPod.(*v1.Pod).Name) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 k8s-ci-robot
					k8s-ci-robot