some test cleanup, comments to explain CI tags

FairwindsOps · Dec 26, 2018 · 5715c25 · 5715c25
1 parent 554faad
commit 5715c25
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -45,6 +45,7 @@ workflows:
       - test
       - build:
           context: org-global
+          # Allow using testing tags for testing circle test + build steps
           filters:
             tags:
               only: /^testing-.*/
@@ -55,5 +56,6 @@ workflows:
           filters:
             branches:
               ignore: /.*/
+            # Testing tags are reserved for testing circle test + build steps
             tags:
               ignore: /^testing-.*/
diff --git a/pkg/validator/container_test.go b/pkg/validator/container_test.go
@@ -44,11 +44,7 @@ func TestValidateResourcesEmptyContainer(t *testing.T) {
 		Name: "Empty",
 	}
 
-	cv := ContainerValidation{
-		Container: container,
-	}
-
-	expected := conf.RequestsAndLimits{
+	resourceConf := conf.RequestsAndLimits{
 		Requests: conf.ResourceList{
 			"cpu": conf.ResourceMinMax{
 				Min: "100m",
@@ -71,8 +67,6 @@ func TestValidateResourcesEmptyContainer(t *testing.T) {
 		},
 	}
 
-	cv.validateResources(expected)
-
 	expectedFailures := []types.Failure{
 		{
 			Name:     "requests.cpu",
@@ -96,8 +90,7 @@ func TestValidateResourcesEmptyContainer(t *testing.T) {
 		},
 	}
 
-	assert.Len(t, cv.Failures, len(expectedFailures))
-	assert.ElementsMatch(t, cv.Failures, expectedFailures)
+	testValidateResources(t, &container, &resourceConf, &expectedFailures)
 }
 
 func TestValidateResourcesPartiallyValid(t *testing.T) {
@@ -119,11 +112,7 @@ func TestValidateResourcesPartiallyValid(t *testing.T) {
 		},
 	}
 
-	cv := ContainerValidation{
-		Container: container,
-	}
-
-	expected := conf.RequestsAndLimits{
+	resourceConf := conf.RequestsAndLimits{
 		Requests: conf.ResourceList{
 			"cpu": conf.ResourceMinMax{
 				Min: "100m",
@@ -146,8 +135,6 @@ func TestValidateResourcesPartiallyValid(t *testing.T) {
 		},
 	}
 
-	cv.validateResources(expected)
-
 	expectedFailures := []types.Failure{
 		{
 			Name:     "requests.memory",
@@ -161,8 +148,7 @@ func TestValidateResourcesPartiallyValid(t *testing.T) {
 		},
 	}
 
-	assert.Len(t, cv.Failures, len(expectedFailures))
-	assert.ElementsMatch(t, cv.Failures, expectedFailures)
+	testValidateResources(t, &container, &resourceConf, &expectedFailures)
 }
 
 func TestValidateResourcesFullyValid(t *testing.T) {
@@ -192,11 +178,7 @@ func TestValidateResourcesFullyValid(t *testing.T) {
 		},
 	}
 
-	cv := ContainerValidation{
-		Container: container,
-	}
-
-	expected := conf.RequestsAndLimits{
+	resourceConf := conf.RequestsAndLimits{
 		Requests: conf.ResourceList{
 			"cpu": conf.ResourceMinMax{
 				Min: "100m",
@@ -219,7 +201,15 @@ func TestValidateResourcesFullyValid(t *testing.T) {
 		},
 	}
 
-	cv.validateResources(expected)
+	testValidateResources(t, &container, &resourceConf, &[]types.Failure{})
+}
 
-	assert.Len(t, cv.Failures, 0)
+func testValidateResources(t *testing.T, container *corev1.Container, conf *conf.RequestsAndLimits, expectedFailures *[]types.Failure) {
+	cv := ContainerValidation{
+		Container: *container,
+	}
+
+	cv.validateResources(*conf)
+	assert.Len(t, cv.Failures, len(*expectedFailures))
+	assert.ElementsMatch(t, cv.Failures, *expectedFailures)
 }