small corrections, comments, etc.

Author: d-w-moore

.github/workflows/run-the-tests.yml

@@ -20,9 +20,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: who am i
-        run: echo $(id -u) $(id -un)
-
       - name: Start containers
         run: ./start_containers.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"
 

docker-testing/apt-list-all.dockerfile

@@ -36,15 +36,12 @@ ARG irods_package_version_suffix=-0~focal
 ARG irods_package_version=${irods_version}${irods_package_version_suffix}
 ARG irods_resource_plugin_version=${irods_version}.0${irods_package_version_suffix}
 
-## TODO : examine.  the below command also installed:
-#irods-resource-plugin-s3=${irods_resource_plugin_version} 
-
 RUN apt-get update && \
     apt-get install -y \
-        irods-database-plugin-postgres=${irods_package_version} \
-        irods-runtime=${irods_package_version} \
-        irods-server=${irods_package_version} \
-        irods-icommands=${irods_package_version} \
+         irods-database-plugin-postgres=${irods_package_version} \
+         irods-runtime=${irods_package_version} \
+         irods-server=${irods_package_version} \
+         irods-icommands=${irods_package_version} \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/*

docker-testing/irods_catalog_provider_4/Dockerfile

@@ -42,14 +42,14 @@ ARG irods_package_version_suffix=-0~noble
 ARG irods_package_version=${irods_version}${irods_package_version_suffix}
 
 RUN apt-get update && \
-     apt-get install -y \
+    apt-get install -y \
          irods-database-plugin-postgres=${irods_package_version} \
          irods-runtime=${irods_package_version} \
          irods-server=${irods_package_version} \
          irods-icommands=${irods_package_version} \
-     && \
-     apt-get clean && \
-     rm -rf /var/lib/apt/lists/* /tmp/*
+    && \
+    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/Dockerfile

@@ -11,7 +11,10 @@ fi
 DIR=$(dirname "$0")
 
 server_ctl() {
+    # This script takes one argument.
+    # Valid arguments: start, stop, or restart.  The appropriate action is then taken for the resident iRODS server.
     if "$DIR"/irods_version_greater_or_equal_to --use_env_var=IRODS_PACKAGE_VERSION 5.0; then
+        # Make our ps-based script wait for process shutdown like 'irodsctl stop' does.
         W=""
         if [ "$1" = stop ]; then
           W=wait
@@ -74,6 +77,7 @@ def failing_with_message_py(rule_args,callback,rei):
 
 server_ctl start
 
+# Wait until 'irule -a' shows Python Rule Engine Plugin among the choices
 if [ -n "$wait" ]; then
     times=0
     OUTFILE=/tmp/irule_output.stderr