diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-08 16:26:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 16:26:20 +0000 |
| commit | 2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5 (patch) | |
| tree | 8aeef090d03d139578a51a0cc038da2a797cc2f3 | |
| parent | 7472aa112a608d147fd1fa3cb7e7674f8c1511c5 (diff) | |
| parent | 921e9ecbb310a0ea65a7c0eac8432fa86fdbd903 (diff) | |
| download | podman-2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5.tar.gz podman-2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5.tar.bz2 podman-2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5.zip | |
Merge pull request #12546 from edsantiago/fix_failing_tests
[3.4] Fix failing tests
| -rw-r--r-- | test/system/035-logs.bats | 4 | ||||
| -rw-r--r-- | test/system/450-interactive.bats | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index d9ec8423b..76002d362 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -91,6 +91,10 @@ ${cid[0]} d" "Sequential output from logs" function _log_test_restarted() { run_podman run --log-driver=$1 --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log' + # FIXME: #9597 + # run/start is flaking for remote so let's wait for the container condition + # to stop wasting energy until the root cause gets fixed. + run_podman container wait --condition=exited logtest run_podman start -a logtest logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX) $PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile diff --git a/test/system/450-interactive.bats b/test/system/450-interactive.bats index 47bdff9ab..d42f8497e 100644 --- a/test/system/450-interactive.bats +++ b/test/system/450-interactive.bats @@ -49,6 +49,8 @@ function teardown() { # BEGIN tests @test "podman detects correct tty size" { + skip "FIXME: #10710. As of 2021-12-08, stty fails >75% of the time." + # Set the pty to a random size. Make rows/columns odd/even, to guarantee # that they can never be the same rows=$(( 15 + RANDOM % 60 | 1 )) |