admission_test.go(createSCCListerAndIndexer): introduce and use funct…

…ion.
openshift · Nov 14, 2017 · ae97160 · ae97160
1 parent 0cdb8b1
commit ae97160
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/pkg/security/admission/admission_test.go b/pkg/security/admission/admission_test.go
@@ -417,11 +417,10 @@ func TestAdmitFailure(t *testing.T) {
 		Groups: []string{"system:serviceaccounts"},
 	}
 
-	indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
-	lister := securitylisters.NewSecurityContextConstraintsLister(indexer)
-
-	indexer.Add(saExactSCC)
-	indexer.Add(saSCC)
+	lister, indexer := createSCCListerAndIndexer(t, []*securityapi.SecurityContextConstraints{
+		saExactSCC,
+		saSCC,
+	})
 
 	// create the admission plugin
 	p := NewTestAdmission(lister, tc)
@@ -1169,13 +1168,18 @@ func setupClientSet() *clientsetfake.Clientset {
 	return clientsetfake.NewSimpleClientset(namespace, serviceAccount)
 }
 
-func createSCCLister(t *testing.T, sccs []*securityapi.SecurityContextConstraints) securitylisters.SecurityContextConstraintsLister {
+func createSCCListerAndIndexer(t *testing.T, sccs []*securityapi.SecurityContextConstraints) (securitylisters.SecurityContextConstraintsLister, cache.Indexer) {
 	indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 	lister := securitylisters.NewSecurityContextConstraintsLister(indexer)
 	for _, scc := range sccs {
 		if err := indexer.Add(scc); err != nil {
 			t.Fatalf("error adding SCC to store: %v", err)
 		}
 	}
+	return lister, indexer
+}
+
+func createSCCLister(t *testing.T, sccs []*securityapi.SecurityContextConstraints) securitylisters.SecurityContextConstraintsLister {
+	lister, _ := createSCCListerAndIndexer(t, sccs)
 	return lister
 }