Fix transient "Area 51" failures (#3476)

Also, removes an unused definition which was left over from PR #3427 and reformats a long line which it added.

Author: webbnh

agent/util-scripts/gold/test-start-stop-tool-meister/test-51.txt

@@ -26,7 +26,6 @@ pbench-tool-meister-stop: constructed SignalExporter() object
 pbench-tool-meister-stop: constructing SignalExporter() object using host localhost:17001, name: stop-pbench-client
 pbench-tool-meister-stop: publish state signal for state end with metadata: {'group': 'default', 'directory': '/var/tmp/pbench-test-utils/pbench/mock-run/tools-default', 'args': None}
 pbench-tool-meister-stop: publish state signal for state terminate with metadata: {'group': 'default', 'directory': None, 'args': {'interrupt': False}}
-pbench-tool-meister-stop: waiting for tool-data-sink (#####) to exit
 --- Finished test-51 test-start-stop-tool-meister (status=0)
 +++ pbench tree state
 /var/tmp/pbench-test-utils/pbench

agent/util-scripts/gold/test-start-stop-tool-meister/test-52.txt

@@ -26,7 +26,6 @@ pbench-tool-meister-stop: constructed SignalExporter() object
 pbench-tool-meister-stop: constructing SignalExporter() object using host localhost:17001, name: stop-pbench-client
 pbench-tool-meister-stop: publish state signal for state end with metadata: {'group': 'mygroup', 'directory': '/var/tmp/pbench-test-utils/pbench/mock-run/tools-mygroup', 'args': None}
 pbench-tool-meister-stop: publish state signal for state terminate with metadata: {'group': 'mygroup', 'directory': None, 'args': {'interrupt': False}}
-pbench-tool-meister-stop: waiting for tool-data-sink (#####) to exit
 --- Finished test-52 test-start-stop-tool-meister (status=0)
 +++ pbench tree state
 /var/tmp/pbench-test-utils/pbench

agent/util-scripts/unittests

@@ -262,7 +262,7 @@ function _verify_output {
            -e 's;v[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*;v#.##.##;g' \
            -e 's;"pid": [0-9][0-9]*\([,}]\);"pid": NNNNN\1;g' \
            -e "s;'pid': [0-9][0-9]*\([,}]\);'pid': NNNNN\1;g" \
-           -e "s;\(waiting for tool-data-sink\) ([0-9][0-9]*) \(to exit\);\1 (#####) \2;g" \
+           -e "/waiting for tool-data-sink ([0-9][0-9]*) to exit/ d" \
            -e 's;tar up [0-9][0-9]* bytes;tar up ##### bytes;g' \
            ${_testout}
     if [[ ${?} -ne 0 ]]; then

exec-tests

@@ -243,7 +243,13 @@ if [[ "${major}" == "all" || "${major}" == "server" ]]; then
         shift
         posargs="${@}"
         # We use SQLALCHEMY_SILENCE_UBER_WARNING here ... (see above).
-        REQUESTS_CA_BUNDLE=${PWD}/server/pbenchinacan/etc/pki/tls/certs/pbench_CA.crt SQLALCHEMY_SILENCE_UBER_WARNING=1 PYTHONUNBUFFERED=True PBENCH_SERVER=${server_arg} KEEP_DATASETS="${keep_datasets}" pytest --tb=native -v -s -rs --pyargs ${posargs} pbench.test.functional.server
+        REQUESTS_CA_BUNDLE=${PWD}/server/pbenchinacan/etc/pki/tls/certs/pbench_CA.crt \
+            SQLALCHEMY_SILENCE_UBER_WARNING=1 \
+            PYTHONUNBUFFERED=True \
+            PBENCH_SERVER=${server_arg} \
+            KEEP_DATASETS="${keep_datasets}" \
+                pytest --tb=native -v -s -rs --pyargs ${posargs} \
+                    pbench.test.functional.server
         rc=${?}
     fi
 fi

server/pbenchinacan/deploy

@@ -44,7 +44,6 @@ PB_DEPLOY_FILES=${PB_DEPLOY_FILES:-${HOME}/Deploy}
 SRV_PBENCH=${SRV_PBENCH:-/srv/pbench}
 PB_SSL_CERT_FILE=${PB_SSL_CERT_FILE:-${PB_DEPLOY_FILES}/pbench-server.crt}
 PB_SSL_KEY_FILE=${PB_SSL_KEY_FILE:-${PB_DEPLOY_FILES}/pbench-server.key}
-PB_SSL_CA_FILE=${PB_SSL_CA_FILE:-${PWD}/server/pbenchinacan/etc/pki/tls/certs/pbench_CA.crt}
 
 # Locations inside the container
 #