Clean up some error checking in controller tests

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

controllers/workspace/devworkspace_controller_test.go

@@ -61,8 +61,7 @@ var _ = Describe("DevWorkspace Controller", func() {
 		It("Sets DevWorkspace ID and Starting status", func() {
 			By("Reading DevWorkspace from testdata file")
 			devworkspace := &dw.DevWorkspace{}
-			err := loadObjectFromFile(devWorkspaceName, devworkspace, "test-devworkspace.yaml")
-			Expect(err).NotTo(HaveOccurred())
+			Expect(loadObjectFromFile(devWorkspaceName, devworkspace, "test-devworkspace.yaml")).Should(Succeed())
 
 			By("Creating a new DevWorkspace")
 			Expect(k8sClient.Create(ctx, devworkspace)).Should(Succeed())
@@ -99,8 +98,7 @@ var _ = Describe("DevWorkspace Controller", func() {
 		It("Allows overriding the DevWorkspace ID", func() {
 			By("Reading DevWorkspace from testdata file")
 			devworkspace := &dw.DevWorkspace{}
-			err := loadObjectFromFile(devWorkspaceName, devworkspace, "test-devworkspace.yaml")
-			Expect(err).NotTo(HaveOccurred())
+			Expect(loadObjectFromFile(devWorkspaceName, devworkspace, "test-devworkspace.yaml")).Should(Succeed())
 
 			if devworkspace.Annotations == nil {
 				devworkspace.Annotations = map[string]string{}
@@ -131,8 +129,7 @@ var _ = Describe("DevWorkspace Controller", func() {
 		It("Forbids duplicate workspace IDs from override", func() {
 			By("Reading DevWorkspace from testdata file")
 			devworkspace := &dw.DevWorkspace{}
-			err := loadObjectFromFile(devWorkspaceName, devworkspace, "test-devworkspace.yaml")
-			Expect(err).NotTo(HaveOccurred())
+			Expect(loadObjectFromFile(devWorkspaceName, devworkspace, "test-devworkspace.yaml")).Should(Succeed())
 
 			if devworkspace.Annotations == nil {
 				devworkspace.Annotations = map[string]string{}

controllers/workspace/util_test.go

@@ -44,8 +44,7 @@ var clock kubeclock.Clock = &kubeclock.RealClock{}
 func createDevWorkspace(name, fromFile string) {
 	By("Loading DevWorkspace from test file")
 	devworkspace := &dw.DevWorkspace{}
-	err := loadObjectFromFile(name, devworkspace, fromFile)
-	Expect(err).NotTo(HaveOccurred())
+	Expect(loadObjectFromFile(name, devworkspace, fromFile)).Should(Succeed())
 
 	By("Creating DevWorkspace on cluster")
 	Expect(k8sClient.Create(ctx, devworkspace)).Should(Succeed())