metadapta_test.go

@@ -31,21 +31,23 @@ func TestConnA(test *testing.T) {
 	// server
 	listener, err := net.Listen(network, addr)
 	if err != nil { test.Fatal(err) }
-	defer listener.Close()
+	test.Cleanup(func() { listener.Close() })
 	go func() {
 		test.Log("SERVER listening")
 		conn, err := listener.Accept()
 		if err != nil { test.Error("SERVER", err); return }
 		defer conn.Close()
+		test.Cleanup(func() { conn.Close() })
 		a := AdaptA(conn, ServerSide)
 		trans, err := a.OpenTrans()
 		if err != nil { test.Error("SERVER", err); return }
-		defer trans.Close()
+		test.Cleanup(func() { trans.Close() })
 		for method, payload := range payloads {
-			test.Log("SERVER", method, payload)
+			test.Log("SERVER m:", method, "p:", payload)
 			err := trans.Send(uint16(method), []byte(payload))
 			if err != nil { test.Error("SERVER", err); return }
 		}
+		test.Log("SERVER closing connection")
 	}()
 
 	// client