Merge pull request #9782 from afbjorklund/terminal-getsize

[NO TESTS NEEDED] Fix swapped dimensions from terminal.GetSize
containers · Mar 26, 2021 · 7ae1d23 · 7ae1d23
2 parents 9e23e0b + 826c228
commit 7ae1d23
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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 ))