fix: update doctor test cases

juicedata · Sep 5, 2022 · 7754db8 · 7754db8
1 parent 187f54b
commit 7754db8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/cmd/doctor.go b/cmd/doctor.go
@@ -117,7 +117,7 @@ func getCmdMount(mp string) (pid, cmd string, err error) {
 	}
 
 	ret, err := exec.Command("bash", "-c", "ps -ef | grep 'juicefs mount' | grep "+mp).CombinedOutput()
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "exit status 1") {
 		return "", "", fmt.Errorf("failed to execute command `ps -ef | grep juicefs | grep %s`: %v", mp, err)
 	}
 
@@ -240,8 +240,8 @@ func getPprofPort(pid string) (int, error) {
 		cmdStr = "sudo " + cmdStr
 	}
 	ret, err := exec.Command("bash", "-c", cmdStr).CombinedOutput()
-	if err != nil {
-		return 0, fmt.Errorf("failed to execute command `ps -ef | grep juicefs`: %v", err)
+	if err != nil && !strings.Contains(err.Error(), "exit status 1") {
+		return 0, fmt.Errorf("failed to execute command `%s`: %v", cmdStr, err)
 	}
 	lines := strings.Split(string(ret), "\n")
 	if len(lines) == 0 {

diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go
@@ -24,6 +24,8 @@ import (
 )
 
 func TestDoctor(t *testing.T) {
+	mountTemp(t, nil, nil, nil)
+	defer umountTemp(t)
 	Convey("Positive doctor cases", t, func() {
 		cases := []struct {
 			name string
@@ -32,28 +34,27 @@ func TestDoctor(t *testing.T) {
 			{"Simple cases", []string{"", "doctor"}},
 			{"Enable collecting syslog", []string{"", "doctor", "--collect-log"}},
 			{"Max 5 log entries", []string{"", "doctor", "--collect-log", "--limit", "5"}},
-			{"Enable collecting pprof metric", []string{"", "doctor", "--collect-log", "--collect-pprof"}},
 		}
 
 		for _, c := range cases {
 			Convey(c.name, func() {
-				So(Main(c.args), ShouldBeNil)
+				So(Main(append(c.args, testMountPoint)), ShouldBeNil)
 			})
 
 		}
 	})
 
 	Convey("Specify out dir", t, func() {
 		Convey("Use default out dir", func() {
-			So(Main([]string{"", "doctor"}), ShouldBeNil)
+			So(Main([]string{"", "doctor", testMountPoint}), ShouldBeNil)
 		})
 
 		outDir := "./doctor/ok"
 		Convey("Specify existing out dir", func() {
 			if err := os.MkdirAll(outDir, 0755); err != nil {
 				t.Fatalf("doctor error: %v", err)
 			}
-			So(Main([]string{"", "doctor", "--out-dir", outDir}), ShouldBeNil)
+			So(Main([]string{"", "doctor", "--out-dir", outDir, testMountPoint}), ShouldBeNil)
 			if err := os.RemoveAll(outDir); err != nil {
 				t.Fatalf("doctor error: %v", err)
 			}
@@ -68,7 +69,7 @@ func TestDoctor(t *testing.T) {
 		}
 		for _, c := range edgeCases {
 			Convey(c.name, func() {
-				So(Main([]string{"", "doctor", "--out-dir", c.outDir}), ShouldNotBeNil)
+				So(Main([]string{"", "doctor", "--out-dir", c.outDir, testMountPoint}), ShouldNotBeNil)
 			})
 		}
 	})