Minor cleanups

test_dropbox.sh

@@ -8,10 +8,10 @@ set -x
 # OMERO_USER OMERO_PASS PREFIX
 
 FILENAME=$(date +%Y%m%d-%H%M%S-%N).fake
-docker exec -u omero $PREFIX-master sh -c \
+docker exec $PREFIX-master sh -c \
     "mkdir -p /OMERO/DropBox/root && touch /OMERO/DropBox/root/$FILENAME"
 
-echo "Checking for imported DropBox image $FILENAME "
+echo -n "Checking for imported DropBox image $FILENAME "
 # Retry for 4 mins
 i=0
 result=
@@ -24,6 +24,7 @@ while [ $i -lt 60 ]; do
         exit 0
     fi
     if [ "$result" != "0,0" ]; then
+        echo
         echo "Unexpected query result: $result"
         exit 2
     fi

test_login.sh

@@ -7,7 +7,7 @@ set -x
 # Must be exported by the caller:
 # OMERO_USER OMERO_PASS
 
-WEB_PORT=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "8080/tcp") 0).HostPort}}' omero-grid-test-web)
+WEB_PORT=$(docker inspect --format='{{(index (index .NetworkSettings.Ports "8080/tcp") 0).HostPort}}' $PREFIX-web)
 
 LOGIN_URL="http://localhost:$WEB_PORT/webclient/login/"
 SERVER="1"
@@ -36,7 +36,7 @@ if [ -z "$csrf_token" ]; then
 fi
 
 echo "CSRF token: $csrf_token"
-echo -n "Attempting to login"
+echo -n "Attempting to login "
 # Retry for 2 mins
 DJANGO_TOKEN="csrfmiddlewaretoken=$csrf_token"
 i=0