From 826c228035297585df2e7716ebc4398e6acb63b7 Mon Sep 17 00:00:00 2001 From: Anders F Björklund Date: Mon, 22 Mar 2021 22:09:16 +0100 Subject: Fix swapped dimensions from terminal.GetSize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders F Björklund --- pkg/bindings/containers/attach.go | 2 +- test/system/450-interactive.bats | 2 -- 2 files changed, 1 insertion(+), 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 )) -- cgit v1.2.3-54-g00ecf