Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix transient "Area 51" failures #3476

Merged
merged 3 commits into from
Jul 3, 2023
Merged

Fix transient "Area 51" failures #3476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1a435
Remove instability in Agent legacy tests test-51 and test-52
webbnh Jul 3, 2023
0459578
Reformat a long command line
webbnh Jul 3, 2023
423d6e2
Remove unused definition left over from PR #3427
webbnh Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion agent/util-scripts/gold/test-start-stop-tool-meister/test-51.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion agent/util-scripts/gold/test-start-stop-tool-meister/test-52.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion agent/util-scripts/unittests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion exec-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion server/pbenchinacan/deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down