diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-23 06:22:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 06:22:26 -0400 |
| commit | 31231ffd748d10048e6541b18fd863a66342c6c7 (patch) | |
| tree | e6d32a8ed6bb3328194f4c53d3967343f4d9d39a /contrib | |
| parent | 1a768dbc089c91dda7f552cb89134be9fa498136 (diff) | |
| parent | ad249222d254fec0be84b474906651936b89578b (diff) | |
| download | podman-31231ffd748d10048e6541b18fd863a66342c6c7.tar.gz podman-31231ffd748d10048e6541b18fd863a66342c6c7.tar.bz2 podman-31231ffd748d10048e6541b18fd863a66342c6c7.zip | |
Merge pull request #13959 from cevich/fix_apiv2
Fix hang in apiv2 test_connect
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/logformatter | 3 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter index 3c52e612b..05f05dc0b 100755 --- a/contrib/cirrus/logformatter +++ b/contrib/cirrus/logformatter @@ -20,6 +20,9 @@ use warnings; our $VERSION = '0.1'; +# Autoflush stdout +$| = 1; + # For debugging, show data structures using DumpTree($var) #use Data::TreeDumper; $Data::TreeDumper::Displayaddress = 0; diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 8f956d7f5..aee9bcfbb 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -59,8 +59,11 @@ function _run_unit() { function _run_apiv2() { _bail_if_test_can_be_skipped test/apiv2 - source .venv/requests/bin/activate - make localapiv2 |& logformatter + ( + make localapiv2-bash + source .venv/requests/bin/activate + make localapiv2-python + ) |& logformatter } function _run_compose() { |