@@ -47,17 +47,17 @@ var _ = Describe("validateOCPVersion", func() {
4747 AfterEach (func () {
4848 // Restore original environment variable
4949 if origEnv != "" {
50- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , origEnv )
50+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , origEnv )). To ( Succeed () )
5151 } else {
52- os .Unsetenv ("BM_COCO_OVERRIDE_OCP_VERSION" )
52+ Expect ( os .Unsetenv ("BM_COCO_OVERRIDE_OCP_VERSION" )). To ( Succeed () )
5353 }
5454 })
5555
5656 Context ("when testing version validation logic" , func () {
5757 // Test cases for versions below minimum requirements
5858 DescribeTable ("should return false for versions below minimum" ,
5959 func (version string ) {
60- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , version )
60+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , version )). To ( Succeed () )
6161 valid , err := reconciler .validateOCPVersion ()
6262 Expect (err ).ToNot (HaveOccurred ())
6363 Expect (valid ).To (BeFalse ())
@@ -74,7 +74,7 @@ var _ = Describe("validateOCPVersion", func() {
7474 // Test cases for versions at or above minimum requirements
7575 DescribeTable ("should return true for versions at or above minimum" ,
7676 func (version string ) {
77- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , version )
77+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , version )). To ( Succeed () )
7878 valid , err := reconciler .validateOCPVersion ()
7979 Expect (err ).ToNot (HaveOccurred ())
8080 Expect (valid ).To (BeTrue ())
@@ -95,22 +95,22 @@ var _ = Describe("validateOCPVersion", func() {
9595
9696 // Test cases for invalid version formats
9797 It ("should return error for invalid version format" , func () {
98- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "invalid-version" )
98+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "invalid-version" )). To ( Succeed () )
9999 valid , err := reconciler .validateOCPVersion ()
100100 Expect (err ).To (HaveOccurred ())
101101 Expect (valid ).To (BeFalse ())
102102 Expect (err .Error ()).To (ContainSubstring ("unable to parse current OCP version" ))
103103 })
104104
105105 It ("should return error for malformed version" , func () {
106- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "not-a-version" )
106+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "not-a-version" )). To ( Succeed () )
107107 valid , err := reconciler .validateOCPVersion ()
108108 Expect (err ).To (HaveOccurred ())
109109 Expect (valid ).To (BeFalse ())
110110 })
111111
112112 It ("should handle version with pre-release suffix" , func () {
113- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.21.8-rc1" )
113+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.21.8-rc1" )). To ( Succeed () )
114114 valid , err := reconciler .validateOCPVersion ()
115115 Expect (err ).ToNot (HaveOccurred ())
116116 // Pre-release versions (4.21.8-rc1) are considered LESS than their base (4.21.8) by semver
@@ -121,7 +121,7 @@ var _ = Describe("validateOCPVersion", func() {
121121
122122 Context ("when BM_COCO_OVERRIDE_OCP_VERSION is not set" , func () {
123123 It ("should attempt to fetch from cluster" , func () {
124- os .Unsetenv ("BM_COCO_OVERRIDE_OCP_VERSION" )
124+ Expect ( os .Unsetenv ("BM_COCO_OVERRIDE_OCP_VERSION" )). To ( Succeed () )
125125
126126 // In unit test environment, this will use the test k8s client from suite_test.go
127127 // The cluster won't have the version CRD populated, so it should return an error
@@ -133,14 +133,14 @@ var _ = Describe("validateOCPVersion", func() {
133133
134134 Context ("edge cases" , func () {
135135 It ("should handle version 4.19.26 correctly (just below threshold)" , func () {
136- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.19.26" )
136+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.19.26" )). To ( Succeed () )
137137 valid , err := reconciler .validateOCPVersion ()
138138 Expect (err ).ToNot (HaveOccurred ())
139139 Expect (valid ).To (BeFalse ())
140140 })
141141
142142 It ("should handle version 4.19.27 correctly (exactly at threshold)" , func () {
143- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.19.27" )
143+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.19.27" )). To ( Succeed () )
144144 valid , err := reconciler .validateOCPVersion ()
145145 Expect (err ).ToNot (HaveOccurred ())
146146 Expect (valid ).To (BeTrue ())
@@ -149,7 +149,7 @@ var _ = Describe("validateOCPVersion", func() {
149149 It ("should handle versions between supported minors" , func () {
150150 // 4.19.27+ is supported, 4.20.17+ is supported
151151 // But 4.20.0 to 4.20.16 should not be supported
152- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.20.10" )
152+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.20.10" )). To ( Succeed () )
153153 valid , err := reconciler .validateOCPVersion ()
154154 Expect (err ).ToNot (HaveOccurred ())
155155 Expect (valid ).To (BeFalse ())
@@ -171,11 +171,11 @@ var _ = Describe("validateOCPVersion integration", func() {
171171
172172 Context ("with environment override" , func () {
173173 AfterEach (func () {
174- os .Unsetenv ("BM_COCO_OVERRIDE_OCP_VERSION" )
174+ Expect ( os .Unsetenv ("BM_COCO_OVERRIDE_OCP_VERSION" )). To ( Succeed () )
175175 })
176176
177177 It ("should use environment variable when set" , func () {
178- os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.21.8" )
178+ Expect ( os .Setenv ("BM_COCO_OVERRIDE_OCP_VERSION" , "4.21.8" )). To ( Succeed () )
179179 valid , err := reconciler .validateOCPVersion ()
180180 Expect (err ).ToNot (HaveOccurred ())
181181 Expect (valid ).To (BeTrue ())
0 commit comments