switch to use blackbox testing, move tests to separate module

This allows us to remove the test-dependencies from the module itself

Signed-off-by: Sebastiaan van Stijn <[email protected]>

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
     - name: Test
-      run: go test -v ./...
+      run: cd test && go test -v .
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -30,3 +30,8 @@ jobs:
           docker run --rm -v `pwd`:/go/src/github.com/moby/term -w /go/src/github.com/moby/term \
             golangci/golangci-lint:v1.50.1 golangci-lint run --disable-all -v \
             -E govet -E misspell -E gofmt -E ineffassign -E revive
+      - name: Lint tests
+        run: |
+          docker run --rm -v `pwd`:/go/src/github.com/moby/term -w /go/src/github.com/moby/term/test \
+            golangci/golangci-lint:v1.50.1 golangci-lint run --disable-all -v \
+            -E govet -E misspell -E gofmt -E ineffassign -E revive

go.mod

@@ -4,6 +4,5 @@ go 1.18
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1
-	github.com/creack/pty v1.1.18
 	golang.org/x/sys v0.1.0
 )

go.sum

@@ -1,7 +1,5 @@
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

test/go.mod

@@ -0,0 +1,15 @@
+module github.com/moby/term/test
+
+go 1.18
+
+require (
+	github.com/creack/pty v1.1.18
+	github.com/moby/term v0.0.0-00010101000000-000000000000 // replaced
+)
+
+require (
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+	golang.org/x/sys v0.1.0 // indirect
+)
+
+replace github.com/moby/term => ../

test/go.sum

@@ -0,0 +1,7 @@
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

proxy_test.go → test/proxy_test.go

@@ -1,8 +1,10 @@
-package term
+package test
 
 import (
 	"bytes"
 	"testing"
+
+	. "github.com/moby/term"
 )
 
 func TestEscapeProxyRead(t *testing.T) {

term_test.go → test/term_test.go

@@ -1,14 +1,15 @@
 //go:build !windows
 // +build !windows
 
-package term
+package test
 
 import (
 	"os"
 	"reflect"
 	"testing"
 
 	cpty "github.com/creack/pty"
+	. "github.com/moby/term"
 )
 
 func newTTYForTest(t *testing.T) *os.File {
@@ -47,7 +48,7 @@ func TestGetWinsize(t *testing.T) {
 		t.Fatal("winSize is nil")
 	}
 
-	newSize := Winsize{Width: 200, Height: 200, x: winSize.x, y: winSize.y}
+	newSize := Winsize{Width: 200, Height: 200}
 	err = SetWinsize(tty.Fd(), &newSize)
 	if err != nil {
 		t.Fatal(err)
@@ -70,7 +71,7 @@ func TestSetWinsize(t *testing.T) {
 	if winSize == nil {
 		t.Fatal("winSize is nil")
 	}
-	newSize := Winsize{Width: 200, Height: 200, x: winSize.x, y: winSize.y}
+	newSize := Winsize{Width: 200, Height: 200}
 	err = SetWinsize(tty.Fd(), &newSize)
 	if err != nil {
 		t.Fatal(err)