Fix failing test and the false negative CI

Signed-off-by: Shengjing Zhu <[email protected]>
moby · Jun 25, 2020 · 8e33885 · 8e33885
1 parent dbb4d68
commit 8e33885
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
+.SHELLFLAGS = -ec
 PACKAGES ?= mountinfo mount
 BINDIR ?= _build/bin
 

diff --git a/mountinfo/mountinfo_linux.go b/mountinfo/mountinfo_linux.go
@@ -194,7 +194,7 @@ func unescape(path string) (string, error) {
 			v := c - '0'
 			for j := 2; j < 4; j++ { // one digit already; two more
 				x := s[j] - '0'
-				if x < 0 || x > 7 {
+				if x > 7 {
 					return "", fmt.Errorf("bad escape sequence %q: not a digit", s[:3])
 				}
 				v = (v << 3) | x

diff --git a/mountinfo/mountinfo_linux_test.go b/mountinfo/mountinfo_linux_test.go
@@ -509,7 +509,7 @@ func TestParseMountinfoWithSpaces(t *testing.T) {
 			Opts:       "rw,relatime",
 			Optional:   "",
 			Fstype:     "cifs",
-			Source:     `//foo/BLA\040BLA\040BLA/`,
+			Source:     `//foo/BLA BLA BLA/`,
 			VfsOpts:    `rw,sec=ntlm,cache=loose,unc=\\foo\BLA`,
 		},
 		{