Merge pull request #631 from /issues/549

Fix cross test contamination in controller units

.golangci.yml

@@ -30,6 +30,8 @@ issues:
     - path: _test\.go
       linters:
       - dupl
+    # We are getting false positives comparing the cfserviceinstance and cfservicebinding reconcile loops. This may
+    # become unnecessary later if the implementation diverges more.
     - path: service\w+_controller\.go
       linters:
         - dupl

api/tests/e2e/package_test.go

@@ -25,6 +25,9 @@ var _ = Describe("Package", func() {
 
 		spaceGUID = createSpace(generateGUID("space1"), orgGUID)
 		appGUID = createApp(spaceGUID, generateGUID("app"))
+
+		result = packageResource{}
+		resultErr = cfErrs{}
 	})
 
 	AfterEach(func() {

controllers/controllers/services/cfservicebinding_controller_test.go

@@ -46,6 +46,10 @@ var _ = Describe("CFServiceBinding.Reconcile", func() {
 	)
 
 	BeforeEach(func() {
+		getCFServiceBindingError = nil
+		getCFServiceBindingSecretError = nil
+		updateCFServiceBindingStatusError = nil
+
 		fakeClient = new(fake.Client)
 		fakeStatusWriter = new(fake.StatusWriter)
 		fakeClient.StatusReturns(fakeStatusWriter)
@@ -154,7 +158,7 @@ var _ = Describe("CFServiceBinding.Reconcile", func() {
 		})
 		When("The API errors setting status on the CFServiceBinding", func() {
 			BeforeEach(func() {
-				updateCFServiceBindingStatusError = errors.New("some random error")
+				updateCFServiceBindingStatusError = errors.New("another random error")
 			})
 
 			It("errors", func() {

controllers/controllers/services/cfserviceinstance_controller_test.go

@@ -46,6 +46,10 @@ var _ = Describe("CFServiceInstance.Reconcile", func() {
 	)
 
 	BeforeEach(func() {
+		getCFServiceInstanceError = nil
+		getCFServiceInstanceSecretError = nil
+		updateCFServiceInstanceStatusError = nil
+
 		fakeClient = new(fake.Client)
 		fakeStatusWriter = new(fake.StatusWriter)
 		fakeClient.StatusReturns(fakeStatusWriter)