lib9p

commit bac7a661fa1e9d4efcb7ce6ab90f956e322a2be1
parent ca647525894af888776171b3f9f44d195af1ac65
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Fri, 20 Oct 2023 08:09:54 +0900

update tests

Diffstat:
M
client_test.go
 | 
4
++--
M
server_test.go
 | 
33
++++++++++++++++-----------------

2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/client_test.go b/client_test.go
@@ -97,7 +97,7 @@ func TestTransaction(t *testing.T) {
 	//server.Chatty()
 	client := NewClient(mSize, uname, cr, cw)
 	bg := context.Background()
-	go server.Serve()
+	go server.Serve(bg)
 
 	rmsize, rversion, err := client.Version(bg, mSize, "9P2000")
 	if err != nil {
@@ -125,7 +125,7 @@ func TestClient2(t *testing.T) {
 
 	server := NewServer(fsys, mSize, sr, sw)
 	//server.Chatty()
-	go server.Serve()
+	go server.Serve(context.Background())
 
 	fs, err := Mount(cr, cw, "kenji", "")
 	if err != nil {
diff --git a/server_test.go b/server_test.go
@@ -1,6 +1,7 @@
 package lib9p
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"path/filepath"
@@ -19,34 +20,34 @@ func newReq(s *Server, msg Msg) (*Req, error) {
 	return r, nil
 }
 
-func handleReq(s *Server, r *Req) {
+func handleReq(ctx context.Context, s *Server, r *Req) {
 	switch r.ifcall.(type) {
 	default:
-		respond(r, fmt.Errorf("unknown message type: %d", r.ifcall.Type()))
+		respond(ctx, r, fmt.Errorf("unknown message type: %d", r.ifcall.Type()))
 	case *TVersion:
-		sVersion(s, r)
+		sVersion(ctx, s, r)
 	case *TAuth:
-		sAuth(s, r)
+		sAuth(ctx, s, r)
 	case *TAttach:
-		sAttach(s, r)
+		sAttach(ctx, s, r)
 	case *TWalk:
-		sWalk(s, r)
+		sWalk(ctx, s, r)
 	case *TOpen:
-		sOpen(s, r)
+		sOpen(ctx, s, r)
 	case *TCreate:
-		sCreate(s, r)
+		sCreate(ctx, s, r)
 	case *TRead:
-		sRead(s, r)
+		sRead(ctx, s, r)
 	case *TWrite:
-		sWrite(s, r)
+		sWrite(ctx, s, r)
 	case *TClunk:
-		sClunk(s, r)
+		sClunk(ctx, s, r)
 	case *TRemove:
-		sRemove(s, r)
+		sRemove(ctx, s, r)
 	case *TStat:
-		sStat(s, r)
+		sStat(ctx, s, r)
 	case *TWStat:
-		sWStat(s, r)
+		sWStat(ctx, s, r)
 	}
 }
 
@@ -144,9 +145,7 @@ func TestServer(t *testing.T) {
 			count:  1024,
 		},
 	}
-
 	s := NewServer(fsys, 1024, sr, sw)
-
 	for _, m := range msg {
 		r, err := newReq(s, m)
 		if err != nil {
@@ -154,7 +153,7 @@ func TestServer(t *testing.T) {
 			return
 		}
 		t.Logf("<-- %v\n", r.ifcall)
-		go handleReq(s, r)
+		go handleReq(context.Background(), s, r)
 		buf := make([]byte, 1024)
 
 		_, err = cr.Read(buf)