fix test runs

Author: chuckp22

bin/ghe-host-check

@@ -85,7 +85,9 @@ if [ $rc -ne 0 ]; then
   exit $rc
 fi
 
-CLUSTER=false
+if [ -z "$CLUSTER" ]; then
+  CLUSTER=false
+fi
 if ghe-ssh "$host" -- \
   "[ -f '$GHE_REMOTE_ROOT_DIR/etc/github/cluster' ]"; then
   CLUSTER=true
@@ -117,7 +119,7 @@ fi
 
 NON_WRITABLE=""
 # ensure all nodes are writable
-if "$CLUSTER"; then
+if [ "$CLUSTER" == "true" ] ; then
   if [ -z "$FILE_TO_TEST" ]; then
     if [ -d "/data/user/tmp" ]; then
       FILE_TO_TEST="/data/user/tmp/test-ro-file.txt"
@@ -164,7 +166,7 @@ if [ -n "$GHE_RESTORE_SNAPSHOT_PATH" ]; then
 fi
 
 if [ -z "$GHE_ALLOW_REPLICA_BACKUP" ]; then
-  if [ "$(ghe-ssh $host -- cat $GHE_REMOTE_ROOT_DIR/etc/github/repl-state 2>/dev/null || true)" = "replica" ]; then
+  if [ "$(ghe-ssh $host -- cat $GHE_REMOTE_ROOT_DIR/etc/github/repl-state1 2>/dev/null || true)" = "replica" ]; then
     echo "Error: high availability replica detected." 1>&2
     echo "Backup Utilities should be used to backup from the primary node in" 1>&2
     echo "high availability environments to ensure consistent and reliable backups." 1>&2

test/test-ghe-host-check.sh

@@ -129,7 +129,12 @@ begin_test "ghe-host-check fails when encountering RO file-system"
 (
   set -e
 
-  enable_ro_fs
-  ! FILE_TO_TEST=/run/user/501/test ghe-host-check
+  ghe-ssh "$GHE_HOSTNAME" -- 'mkdir -p "~/tmp"'
+  # Remove write access in ~/tmp
+  ghe-ssh "$GHE_HOSTNAME" -- 'chmod a-w -R "~/tmp"'
+
+  # File creation fails for CLUSTER
+  ! FILE_TO_TEST="~/tmp/test" CLUSTER=true ghe-host-check
+  FILE_TO_TEST="~/tmp/test" CLUSTER=false ghe-host-check
 )
 end_test