whitespace, comments

Author: d-w-moore

docker-testing/irods_catalog_provider_5/Dockerfile

@@ -50,7 +50,7 @@ RUN apt-get update && \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/*
- 
+
 COPY setup-${irods_version}.input /
 RUN mv /setup-${irods_version}.input /irods_setup.input
 

docker-testing/irods_catalog_provider_5/entrypoint.sh

@@ -46,8 +46,5 @@ chmod 0777 /irods_shared
 echo "Starting server"
 
 cd /usr/sbin
-#irods 4
-#su irods -c 'bash -c "./irodsServer -u"'
-#irods 5
 su irods -c 'bash -c "./irodsServer -p /tmp/irods.pid"'
 

irods/test/harness/create_docker_images.sh

@@ -4,7 +4,7 @@ export IRODS_PACKAGE_VERSION=$1
 export PYTHON_VERSION=$2
 
 [ -z "$1" -o -z "$2" ] && {
-  echo >&2 "usage $0 irods-vsn py-vsn"; exit 2; 
+  echo >&2 "usage $0 irods-vsn py-vsn"; exit 2;
 }
 shift 2
 

irods/test/harness/docker_container_driver.sh

@@ -86,7 +86,7 @@ fi
 reporoot=$(./print_repo_root_location)
 ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=$(realpath --relative-to $reporoot "$original_testscript_abspath")
 
-echo "ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=[$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT]" 
+echo "ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=[$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT]"
 INNER_MOUNT=/prc
 
 : ${DOCKER:=docker}
@@ -99,7 +99,7 @@ CONTAINER=$($DOCKER run -d -v $reporoot:$INNER_MOUNT:ro $REMOVE_OPTION $image)
 TIME0=$(date +%s)
 while :; do
     [ `date +%s` -gt $((TIME0 + 30)) ] && { echo >&2 "Waited too long for DB and iRODS to start"; exit 124; }
-    sleep 1 
+    sleep 1
     $DOCKER exec $CONTAINER grep '(0)' /tmp/irods_status 2>/dev/null >/dev/null
     [ $? -ne 0 ] && { echo -n . >&2; continue; }
     break

irods/test/harness/install.sh

@@ -93,7 +93,7 @@ run_phase() {
         sudo apt-get update
         sudo apt-get install -y software-properties-common postgresql
         sudo apt-get update && \
-        sudo apt-get install -y libfuse2 unixodbc rsyslog ################### less python-pip 
+        sudo apt-get install -y libfuse2 unixodbc rsyslog
     fi
 
 

irods/test/harness/start_postgresql_and_irods.sh

@@ -15,7 +15,7 @@ if ! id -u irods >/dev/null 2>&1 ; then
 fi
 IRODS_VSN_MAJOR=$(sed 's!\..*!!'<<<$IRODS_VSN)
 unset IRODS_VSN
-if [ $IRODS_VSN_MAJOR -lt 5 ]; then 
+if [ $IRODS_VSN_MAJOR -lt 5 ]; then
     su - irods -c '~/irodsctl restart'
 else
     /manage_irods5_procs start

irods/test/login_auth_test.sh

@@ -3,8 +3,8 @@
 . $(dirname $0)/scripts/update_json_for_test
 
 IRODS_SERVER_CONFIG=/etc/irods/server_config.json
-IRODS_SERVICE_ACCOUNT_ENV_FILE=~irods/.irods/irods_environment.json 
-LOCAL_ACCOUNT_ENV_FILE=~/.irods/irods_environment.json 
+IRODS_SERVICE_ACCOUNT_ENV_FILE=~irods/.irods/irods_environment.json
+LOCAL_ACCOUNT_ENV_FILE=~/.irods/irods_environment.json
 
 cannot_iinit=''
 tries=8
@@ -23,7 +23,7 @@ add_irods_to_system_pam_configuration
 # set up /etc/irods/ssl directory and files
 set_up_ssl sudo
 
-sudo useradd -ms/bin/bash alissa 
+sudo useradd -ms/bin/bash alissa
 sudo chpasswd <<<"alissa:test123"
 
 update_json_file $IRODS_SERVICE_ACCOUNT_ENV_FILE \
@@ -49,7 +49,7 @@ update_json_file $LOCAL_ACCOUNT_ENV_FILE \
 if [ $server_hup = y ]; then
   # wait for server to be ready after configuration reload
   while true; do
-    sleep 2 
+    sleep 2
     if ils >/dev/null 2>&1; then
       break
     else
@@ -63,7 +63,7 @@ fi
 original_script=/prc/$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT
 
 # Run tests.
-if [ -x "$original_script" ]; then 
+if [ -x "$original_script" ]; then
   command "$original_script" $*
 elif [[ $original_script =~ \.py$ ]]; then
   python "$original_script" $*

irods/test/runner.py

@@ -67,7 +67,7 @@ def abs_path(initial_dir, levels_up = 0):
     args = parser.parse_args()
 
     if args.tests_file:
-        if args.tests: 
+        if args.tests:
             print ('Cannot specify both --tests and --tests_file', file = sys.stderr)
             exit(2)
         args.tests = filter(None,open(args.tests_file).read().split("\n"))
@@ -85,7 +85,7 @@ def abs_path(initial_dir, levels_up = 0):
 
     if args.skipped_tests_output_filename:
         with open(args.skipped_tests_output_filename,'w') as f:
-            do_output = (lambda reason: (args.env_var in reason) if args.env_var 
+            do_output = (lambda reason: (args.env_var in reason) if args.env_var
                 else True)
             for testinfo, reason in result.skipped:
                 if do_output(reason):