OCM-10854 | test: fix id:57094

openshift · Sep 2, 2024 · 05214fe · 05214fe
1 parent aa74b59
commit 05214fe
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tests/e2e/test_rosacli_upgrade.go b/tests/e2e/test_rosacli_upgrade.go
@@ -464,7 +464,7 @@ var _ = Describe("Describe/List rosa upgrade",
 						hostedCluster, err := clusterService.IsHostedCPCluster(clusterID)
 						Expect(err).ToNot(HaveOccurred())
 						if !hostedCluster {
-							_, errSTSUpgrade := upgradeService.Upgrade(
+							output, errSTSUpgrade := upgradeService.Upgrade(
 								"-c", clusterID,
 								"--version", upgradingVersion,
 								"--schedule-date", scheduledDate,
@@ -473,8 +473,9 @@ var _ = Describe("Describe/List rosa upgrade",
 								"-y",
 							)
 							Expect(errSTSUpgrade).To(BeNil())
+							Expect(output.String()).NotTo(ContainSubstring("There is already a scheduled upgrade"))
 						} else {
-							_, errHCPUpgrade := upgradeService.Upgrade(
+							output, errHCPUpgrade := upgradeService.Upgrade(
 								"-c", clusterID,
 								"--version", upgradingVersion,
 								"--schedule-date", scheduledDate,
@@ -484,16 +485,18 @@ var _ = Describe("Describe/List rosa upgrade",
 								"-y",
 							)
 							Expect(errHCPUpgrade).To(BeNil())
+							Expect(output.String()).NotTo(ContainSubstring("There is already a scheduled upgrade"))
 						}
 					} else {
-						_, errUpgrade := upgradeService.Upgrade(
+						output, errUpgrade := upgradeService.Upgrade(
 							"-c", clusterID,
 							"--version", upgradingVersion,
 							"--schedule-date", scheduledDate,
 							"--schedule-time", scheduledTime,
 							"-y",
 						)
 						Expect(errUpgrade).To(BeNil())
+						Expect(output.String()).NotTo(ContainSubstring("There is already a scheduled upgrade"))
 					}
 
 					time.Sleep(2 * time.Minute)