diff options
Diffstat (limited to 'pkg/test/defer_test.go')
| -rw-r--r-- | pkg/test/defer_test.go | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkg/test/defer_test.go b/pkg/test/defer_test.go index 215e0b1..57854b2 100644 --- a/pkg/test/defer_test.go +++ b/pkg/test/defer_test.go @@ -5,28 +5,27 @@ import ( ) func TestDeferSocket(t *testing.T) { - c, s := newClientServer(t) - defer closeClientServer(c, s) + e := newEnv(t) + defer e.Free() + + c := e.newInstance() c.Exec("add name T listen,addr=-:0 defer,addr=@[addr]") - out := xDial(t, "tcp", c.Get("tunnel.T.listen")) - defer out.Close() + out := e.Dial("tcp", c.Get("tunnel.T.listen")) - listen := xListen(t, "tcp", "127.0.0.1:0") - defer listen.Close() + listen := e.Listen("tcp", "127.0.0.1:0") c.Set("addr", listen.Addr()) - xWrite(t, out, xData) + e.Write(out, dummy) - in := xAccept(t, listen) - defer in.Close() + in := e.Accept(listen) - buf := make([]byte, len(xData)) - xReadFull(t, in, buf) + buf := make([]byte, len(dummy)) + e.ReadFull(in, buf) - if r := string(buf); r != xData { - t.Fatalf("wrong reply: send '%s', recv '%s'", xData, r) + if r := string(buf); r != dummy { + e.Fatalf("wrong reply: send '%s', recv '%s'", dummy, r) } } |