cli: reword message about mount and offline

Kubuxu · whyrusleeping · commit a42302443b31 · 2016-08-03T08:04:07.000-07:00
License: MIT
Signed-off-by: Jakub Sztandera &lt;kubuxu@protonmail.ch&gt;
diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
@@ -340,7 +340,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
 		return
 	}
 	if mount && offline {
-		res.SetError(errors.New("mount is not supported in offline mode"),
+		res.SetError(errors.New("mount is not currently supported in offline mode"),
 			cmds.ErrClient)
 		return
 	}
diff --git a/test/sharness/t0600-issues-and-regressions-online.sh b/test/sharness/t0600-issues-and-regressions-online.sh
@@ -30,8 +30,8 @@ test_expect_success "no panic traces on daemon" '
 test_kill_ipfs_daemon
 
 test_expect_success "ipfs daemon --offline --mount fails - #2995" '
-	(test_must_fail ipfs daemon --offline --mount 2>daemon_err) &&
-	grep "mount is not supported in offline mode" daemon_err
+	test_expect_code 1 ipfs daemon --offline --mount 2>daemon_err &&
+	grep "mount is not currently supported in offline mode" daemon_err
 '
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {`
`340`	`340`	`return`
`341`	`341`	`}`
`342`	`342`	`if mount && offline {`
`343`		`- res.SetError(errors.New("mount is not supported in offline mode"),`
	`343`	`+ res.SetError(errors.New("mount is not currently supported in offline mode"),`
`344`	`344`	`cmds.ErrClient)`
`345`	`345`	`return`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ test_expect_success "no panic traces on daemon" '`
`30`	`30`	`test_kill_ipfs_daemon`
`31`	`31`
`32`	`32`	`test_expect_success "ipfs daemon --offline --mount fails - #2995" '`
`33`		`- (test_must_fail ipfs daemon --offline --mount 2>daemon_err) &&`
`34`		`- grep "mount is not supported in offline mode" daemon_err`
	`33`	`+ test_expect_code 1 ipfs daemon --offline --mount 2>daemon_err &&`
	`34`	`+ grep "mount is not currently supported in offline mode" daemon_err`
`35`	`35`	`'`
`36`	`36`
`37`	`37`	`test_done`