lib9p

commit 0b14fde3fefe9f1ce61d29b688aacaa5e9aedd4f
parent 1af9ed9209e9b57bd6ba0d5a9898d2a0160d751f
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Sat, 21 Oct 2023 08:51:03 +0900

update tests

Diffstat:
M
client_test.go
 | 
31
+++++++++++++++++++++++++------
M
req_test.go
 | 
30
+++++++++++++++++++++++++-----

2 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/client_test.go b/client_test.go
@@ -19,7 +19,7 @@ func newClientForTest(msize uint32, uname string, tmsgc chan<- Msg, rmsgc <-chan
 		mSizeLock: new(sync.Mutex),
 		uname:     uname,
 		fPool:     allocClientFidPool(),
-		rPool:     newClientReqPool(),
+		tPool:     newTagPool(),
 		errc:      make(chan error),
 		cancel:    cancel,
 	}
@@ -58,7 +58,12 @@ func TestClientVersion(t *testing.T) {
 			)
 			wg.Add(1)
 			go func() {
-				gotmsize, gotversion, goterr = c.Version(bg, test.mSize, test.version)
+				tag, err := c.tPool.add()
+				if err != nil {
+					t.Fatalf("add tag: %v", err)
+				}
+				gotmsize, gotversion, goterr = c.Version(bg, tag, test.mSize, test.version)
+				c.tPool.delete(tag)
 				wg.Done()
 			}()
 			gottmsg := <-tmsgc
@@ -97,20 +102,34 @@ func TestTransaction(t *testing.T) {
 	client := NewClient(mSize, uname, cr, cw)
 	bg := context.Background()
 	go server.Serve(bg)
-
-	rmsize, rversion, err := client.Version(bg, mSize, "9P2000")
+	tag, err := client.tPool.add()
+	if err != nil {
+		t.Fatalf("add tag: %v", err)
+	}
+	rmsize, rversion, err := client.Version(bg, tag, mSize, "9P2000")
+	client.tPool.delete(tag)
 	if err != nil {
 		t.Log(err)
 	} else {
 		t.Log(&RVersion{mSize: rmsize, version: rversion})
 	}
-	rauth, err := client.Auth(bg, 0, "kenji", "")
+	tag, err = client.tPool.add()
+	if err != nil {
+		t.Fatalf("add tag: %v", err)
+	}
+	rauth, err := client.Auth(bg, tag, 0, "kenji", "")
+	client.tPool.delete(tag)
 	if err != nil {
 		t.Log(err)
 	} else {
 		t.Log(rauth)
 	}
-	rattach, err := client.Attach(bg, 0, NOFID, "kenji", "")
+	tag, err = client.tPool.add()
+	if err != nil {
+		t.Fatalf("add tag: %v", err)
+	}
+	rattach, err := client.Attach(bg, tag, 0, NOFID, "kenji", "")
+	client.tPool.delete(tag)
 	if err != nil {
 		t.Log(err)
 	} else {
diff --git a/req_test.go b/req_test.go
@@ -25,27 +25,47 @@ func TestFlush(t *testing.T) {
 	go s.Serve(ctx)
 	c := NewClient(mSize, uname, cr, cw)
 	defer c.Stop()
-	rmsize, rversion, err := c.Version(ctx, mSize, "9P2000")
+	rmsize, rversion, err := c.Version(ctx, NOTAG, mSize, "9P2000")
 	if err != nil {
 		t.Fatalf("version: %v", err)
 	}
 	t.Logf("rversion: %d, %s", rmsize, rversion)
-	_, err = c.Attach(ctx, 0, NOFID, uname, "")
+	tag, err := c.tPool.add()
+	if err != nil {
+		t.Fatalf("add tag: %v", err)
+	}
+	_, err = c.Attach(ctx, tag, 0, NOFID, uname, "")
+	c.tPool.delete(tag)
 	if err != nil {
 		t.Fatalf("attach: %v", err)
 	}
-	_, err = c.Walk(ctx, 0, 1, []string{"a"})
+	tag, err = c.tPool.add()
+	if err != nil {
+		t.Fatalf("add tag: %v", err)
+	}
+	_, err = c.Walk(ctx, tag, 0, 1, []string{"a"})
+	c.tPool.delete(tag)
 	if err != nil {
 		t.Fatalf("walk: %v", err)
 	}
-	_, _, err = c.Open(ctx, 1, OREAD)
+	tag, err = c.tPool.add()
+	if err != nil {
+		t.Fatalf("add tag: %v", err)
+	}
+	_, _, err = c.Open(ctx, tag, 1, OREAD)
+	c.tPool.delete(tag)
 	if err != nil {
 		t.Fatalf("open: %v", err)
 	}
 	ctx1, cancel1 := context.WithCancel(ctx)
 	done := make(chan string)
 	go func() {
-		data, err := c.Read(ctx1, 1, 0, mSize-IOHDRSZ)
+		tag, err := c.tPool.add()
+		if err != nil {
+			t.Fatalf("add tag: %v", err)
+		}
+		data, err := c.Read(ctx1, tag, 1, 0, mSize-IOHDRSZ)
+		c.tPool.delete(tag)
 		t.Logf("read data: %v, err: %v", data, err)
 		done <- "read goroutine returned"
 	}()