diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-26 13:21:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 13:21:10 +0000 |
| commit | 7ae1d23a380ae0c9cf4edb64ba288a8464c3cf13 (patch) | |
| tree | 3010ae62175a0dc4a10c0fd5d6c2d395dd00667f | |
| parent | 9e23e0b3e3b219cbdc42fac4f843d6d2ec97421b (diff) | |
| parent | 826c228035297585df2e7716ebc4398e6acb63b7 (diff) | |
| download | podman-7ae1d23a380ae0c9cf4edb64ba288a8464c3cf13.tar.gz podman-7ae1d23a380ae0c9cf4edb64ba288a8464c3cf13.tar.bz2 podman-7ae1d23a380ae0c9cf4edb64ba288a8464c3cf13.zip | |
Merge pull request #9782 from afbjorklund/terminal-getsize
[NO TESTS NEEDED] Fix swapped dimensions from terminal.GetSize
| -rw-r--r-- | pkg/bindings/containers/attach.go | 2 | ||||
| -rw-r--r-- | test/system/450-interactive.bats | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go index f48b99a95..ecae22a1b 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -336,7 +336,7 @@ func attachHandleResize(ctx, winCtx context.Context, winChange chan os.Signal, i case <-winCtx.Done(): return case <-winChange: - h, w, err := terminal.GetSize(int(file.Fd())) + w, h, err := terminal.GetSize(int(file.Fd())) if err != nil { logrus.Warnf("failed to obtain TTY size: %v", err) } diff --git a/test/system/450-interactive.bats b/test/system/450-interactive.bats index 33841bc16..d047b9f25 100644 --- a/test/system/450-interactive.bats +++ b/test/system/450-interactive.bats @@ -49,8 +49,6 @@ function teardown() { # BEGIN tests @test "podman detects correct tty size" { - skip_if_remote "FIXME: resolved in #9782" - # 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 )) |