From c6e8befe21f192ca7bb2704577ec210db8e74aa8 Mon Sep 17 00:00:00 2001
From: Chris Roberts <chrobert@redhat.com>
Date: Thu, 21 Mar 2019 15:31:04 -0400
Subject: [PATCH] Update some grammer issues in the test Bash scripts

Related: rhbz#1656105
---
 tests/cli/test_build_and_deploy_vmware.sh | 14 +++++++-------
 tests/test_cli.sh                         | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/cli/test_build_and_deploy_vmware.sh b/tests/cli/test_build_and_deploy_vmware.sh
index e9a2a126..a45a5220 100755
--- a/tests/cli/test_build_and_deploy_vmware.sh
+++ b/tests/cli/test_build_and_deploy_vmware.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Note: execute this file from the project root directory
+# Note: Execute this file from the project root directory
 
 #####
 #
@@ -64,7 +64,7 @@ rlJournalStart
         SAMPLES="$SAMPLES/samples"
     rlPhaseEnd
 
-    rlPhaseStartTest "compose start"
+    rlPhaseStartTest "Compose start"
         rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"
         SSH_KEY_DIR=`mktemp -d /tmp/composer-ssh-keys.XXXXXX`
         rlRun -t -c "ssh-keygen -t rsa -N '' -f $SSH_KEY_DIR/id_rsa"
@@ -92,7 +92,7 @@ __EOF__
         UUID=`echo $UUID | cut -f 2 -d' '`
     rlPhaseEnd
 
-    rlPhaseStartTest "compose finished"
+    rlPhaseStartTest "Compose finished"
         if [ -n "$UUID" ]; then
             until $CLI compose details $UUID | grep FINISHED; do
                 rlLogInfo "Waiting for compose to finish ..."
@@ -109,7 +109,7 @@ __EOF__
 
         python $SAMPLES/upload_file_to_datastore.py -S -s $V_HOST -u $V_USERNAME -p $V_PASSWORD \
                 -d $V_DATASTORE -l `readlink -f $IMAGE` -r $IMAGE
-        rlAssert0 "Image upload successfull" $?
+        rlAssert0 "Image upload successful" $?
     rlPhaseEnd
 
     rlPhaseStartTest "Start VM instance"
@@ -125,7 +125,7 @@ __EOF__
             rlLogInfo "INSTANCE_UUID=$INSTANCE_UUID"
         fi
 
-        # wait for instance to become running and had assigned a public IP
+        # Wait for instance to become running and had assigned a public IP
         IP_ADDRESS="None"
         while [ "$IP_ADDRESS" == "None" ]; do
             rlLogInfo "IP_ADDRESS is not assigned yet ..."
@@ -141,12 +141,12 @@ __EOF__
     rlPhaseEnd
 
     rlPhaseStartTest "Verify VM instance"
-        # verify we can login into that instance
+        # Verify we can login into that instance
         rlRun -t -c "ssh -oStrictHostKeyChecking=no -i $SSH_KEY_DIR/id_rsa root@$IP_ADDRESS 'cat /etc/redhat-release'"
     rlPhaseEnd
 
     rlPhaseStartCleanup
-        # note: vmdk disk is removed when destroying the VM
+        # note: VMDK disk is removed when destroying the VM
         python $SAMPLES/destroy_vm.py -S -s $V_HOST -u $V_USERNAME -p $V_PASSWORD --uuid $INSTANCE_UUID
         rlAssert0 "VM destroyed" $?
         rlRun -t -c "$CLI compose delete $UUID"
diff --git a/tests/test_cli.sh b/tests/test_cli.sh
index 558d725c..2aa270e0 100755
--- a/tests/test_cli.sh
+++ b/tests/test_cli.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Note: execute this file from the project root directory
+# Note: Execute this file from the project root directory
 
 # setup
 rm -rf /var/tmp/beakerlib-*/
@@ -26,7 +26,7 @@ if [ -z "$CLI" ]; then
     chmod a+rx -R $SHARE_DIR
 
     setup_tests $SHARE_DIR
-    # start the lorax-composer daemon
+    # Start the lorax-composer daemon
     ./src/sbin/lorax-composer --sharedir $SHARE_DIR $BLUEPRINTS_DIR &
 else
     SHARE_DIR="/usr/share/lorax"
@@ -35,7 +35,7 @@ else
 fi
 
 
-# wait for the backend to become ready
+# Wait for the backend to become ready
 tries=0
 until curl -m 15 --unix-socket /run/weldr/api.socket http://localhost:4000/api/status | grep 'db_supported.*true'; do
     tries=$((tries + 1))
@@ -50,11 +50,11 @@ done;
 export BEAKERLIB_JOURNAL=0
 export PATH="/usr/local/bin:$PATH"
 if [ -z "$*" ]; then
-    # invoke cli/ tests which can be executed without special preparation
+    # Invoke cli/ tests which can be executed without special preparation
     ./tests/cli/test_blueprints_sanity.sh
     ./tests/cli/test_compose_sanity.sh
 else
-    # execute other cli tests which need more adjustments in the calling environment
+    # Execute other cli tests which need more adjustments in the calling environment
     # or can't be executed inside Travis CI
     for TEST in "$@"; do
         ./$TEST
@@ -76,8 +76,8 @@ else
     systemctl start lorax-composer
 fi
 
-# look for failures
+# Look for failures
 grep RESULT_STRING /var/tmp/beakerlib-*/TestResults | grep -v PASS && exit 1
 
-# explicit return code for Makefile
+# Explicit return code for Makefile
 exit 0