update: fix unittest

basenana · Apr 4, 2024 · c74e475 · c74e475
1 parent 104ea84
commit c74e475
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/cmd/apps/apis/fsapi/v1/suite_test.go b/cmd/apps/apis/fsapi/v1/suite_test.go
@@ -31,6 +31,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/test/bufconn"
 	"net"
+	"os"
 	"testing"
 )
 
@@ -64,7 +65,10 @@ var _ = BeforeSuite(func() {
 	Expect(err).Should(BeNil())
 	testMeta = memMeta
 
-	storage.InitLocalCache(config.Config{CacheDir: "/tmp", CacheSize: 0})
+	workdir, err := os.MkdirTemp(os.TempDir(), "ut-nanafs-fsapi-")
+	Expect(err).Should(BeNil())
+
+	storage.InitLocalCache(config.Config{CacheDir: workdir, CacheSize: 0})
 
 	ctrl, err = controller.New(mockConfig{}, memMeta)
 	Expect(err).Should(BeNil())
@@ -106,9 +110,13 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	err := mockListen.Close()
-	Expect(err).Should(BeNil())
-	testServer.Stop()
+	if mockListen != nil {
+		err := mockListen.Close()
+		Expect(err).Should(BeNil())
+	}
+	if testServer != nil {
+		testServer.Stop()
+	}
 })
 
 type Client struct {

diff --git a/cmd/apps/fs/node_test.go b/cmd/apps/fs/node_test.go
@@ -538,7 +538,15 @@ var _ = Describe("TestRmdir", func() {
 				Describe("can not see old dir", func() {
 					ds, err := root.Readdir(context.Background())
 					Expect(err).To(Equal(syscall.Errno(0)))
-					Expect(ds.HasNext()).To(BeFalse())
+					found := false
+					for ds.HasNext() {
+						ch, err := ds.Next()
+						Expect(err).To(Equal(syscall.Errno(0)))
+						if ch.Name == dirName {
+							found = true
+						}
+					}
+					Expect(found).To(BeFalse())
 					ds.Close()
 				})
 			})