Issue #760: Reword message at the end of 'crc stop/delete/start'

"The OpenShift cluster deleted" was not correct, it was suggested to use the active voice instead "Deleted the OpenShift cluster" This fixes #760
crc-org · Oct 31, 2019 · 49e925f · 49e925f
1 parent 0f9055f
commit 49e925f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/cmd/crc/cmd/delete.go b/cmd/crc/cmd/delete.go
@@ -46,7 +46,7 @@ func runDelete(arguments []string) {
 		if err != nil {
 			errors.Exit(1)
 		}
-		output.Outln("The OpenShift cluster deleted")
+		output.Outln("Deleted the OpenShift cluster")
 	}
 }
 

diff --git a/cmd/crc/cmd/start.go b/cmd/crc/cmd/start.go
@@ -65,7 +65,7 @@ func runStart(arguments []string) {
 		errors.Exit(1)
 	}
 	if commandResult.Status == "Running" {
-		output.Outln("The OpenShift cluster is running")
+		output.Outln("Started the OpenShift cluster")
 
 		logging.Warn("The cluster might report a degraded or error state. This is expected since several operators have been disabled to lower the resource usage. For more information, please consult the documentation")
 	} else {

diff --git a/cmd/crc/cmd/stop.go b/cmd/crc/cmd/stop.go
@@ -55,7 +55,7 @@ func runStop(arguments []string) {
 		errors.Exit(1)
 	}
 	if commandResult.Success {
-		output.Outln("The OpenShift cluster stopped")
+		output.Outln("Stopped the OpenShift cluster")
 	} else {
 		/* If we did not get an error, the status should be true */
 		logging.Warnf("Unexpected status of the OpenShift cluster: %v", commandResult.Success)
@@ -67,5 +67,5 @@ func killVM(killConfig machine.PowerOffConfig) {
 	if err != nil {
 		errors.Exit(1)
 	}
-	output.Outln("The OpenShift cluster forcibly stopped")
+	output.Outln("Forcibly stopped the OpenShift cluster")
 }
diff --git a/test/integration/features/basic.feature b/test/integration/features/basic.feature
@@ -85,12 +85,12 @@ Feature: Basic test
     @linux @windows
     Scenario: CRC start
         When starting CRC with default bundle and default hypervisor succeeds
-        Then stdout should contain "The OpenShift cluster is running"
+        Then stdout should contain "Started the OpenShift cluster"
 
     @darwin
     Scenario: CRC start on Mac
         When starting CRC with default bundle and hypervisor "hyperkit" succeeds
-        Then stdout should contain "The OpenShift cluster is running"
+        Then stdout should contain "Started the OpenShift cluster"
 
     @darwin @linux @windows
     Scenario: CRC status and disk space check
@@ -117,7 +117,7 @@ Feature: Basic test
     @darwin @linux @windows
     Scenario: CRC forcible stop
         When executing "crc stop -f"
-        Then stdout should match "The OpenShift cluster(.*)stopped"
+        Then stdout should match "(.*)[Ss]topped the OpenShift cluster"
 
     @darwin @linux @windows
     Scenario: CRC status check
@@ -134,4 +134,4 @@ Feature: Basic test
     @darwin @linux @windows
     Scenario: CRC delete
         When executing "crc delete -f" succeeds
-        Then stdout should contain "The OpenShift cluster deleted"
+        Then stdout should contain "Deleted the OpenShift cluster"
diff --git a/test/integration/features/story_health.feature b/test/integration/features/story_health.feature
@@ -7,7 +7,7 @@ Feature:
     Scenario Outline: Start CRC
         Given executing "crc setup" succeeds
         When starting CRC with default bundle and hypervisor "<vm-driver>" succeeds
-        Then stdout should contain "The OpenShift cluster is running"
+        Then stdout should contain "Started the OpenShift cluster"
         And executing "eval $(crc oc-env)" succeeds
         When with up to "4" retries with wait period of "2m" command "crc status" output matches ".*Running \(v\d+\.\d+\.\d+.*\).*"
         Then login to the oc cluster succeeds
@@ -76,6 +76,6 @@ Feature:
     Scenario: Clean up
         Given executing "oc delete project testproj" succeeds
         When executing "crc stop -f" succeeds
-        Then stdout should match "The OpenShift cluster(.*)stopped"
+        Then stdout should match "(.*)[Ss]topped the OpenShift cluster"
         When executing "crc delete -f" succeeds
-        Then stdout should contain "The OpenShift cluster deleted"
+        Then stdout should contain "Deleted the OpenShift cluster"
diff --git a/test/integration/features/story_registry.feature b/test/integration/features/story_registry.feature
@@ -9,7 +9,7 @@ Feature: Local image to image-registry to deployment
     Scenario Outline: Start CRC
         Given executing "crc setup" succeeds
         When starting CRC with default bundle and hypervisor "<vm-driver>" succeeds
-        Then stdout should contain "The OpenShift cluster is running"
+        Then stdout should contain "Started the OpenShift cluster"
         And executing "eval $(crc oc-env)" succeeds
         When with up to "4" retries with wait period of "2m" command "crc status" output matches ".*Running \(v\d+\.\d+\.\d+.*\).*"
         Then login to the oc cluster succeeds