Declared an applyUmask helper.

samples/memfs/memfs_test.go

@@ -70,6 +70,9 @@ func currentGid() uint32 {
 	return uint32(gid)
 }
 
+// Transform the supplied mode by the current umask.
+func applyUmask(m os.FileMode) os.FileMode
+
 ////////////////////////////////////////////////////////////////////////
 // Boilerplate
 ////////////////////////////////////////////////////////////////////////
@@ -183,7 +186,7 @@ func (t *MemFSTest) Mkdir_OneLevel() {
 	AssertEq(nil, err)
 	ExpectEq("dir", fi.Name())
 	ExpectEq(0, fi.Size())
-	ExpectEq(os.ModeDir|0754, fi.Mode())
+	ExpectEq(os.ModeDir|applyUmask(0754), fi.Mode())
 	ExpectThat(fi, fusetesting.MtimeIs(createTime))
 	ExpectThat(fi, fusetesting.BirthtimeIs(createTime))
 	ExpectTrue(fi.IsDir())
@@ -214,7 +217,7 @@ func (t *MemFSTest) Mkdir_OneLevel() {
 
 	fi = entries[0]
 	ExpectEq("dir", fi.Name())
-	ExpectEq(os.ModeDir|0754, fi.Mode())
+	ExpectEq(os.ModeDir|applyUmask(0754), fi.Mode())
 }
 
 func (t *MemFSTest) Mkdir_TwoLevels() {
@@ -245,7 +248,7 @@ func (t *MemFSTest) Mkdir_TwoLevels() {
 	AssertEq(nil, err)
 	ExpectEq("dir", fi.Name())
 	ExpectEq(0, fi.Size())
-	ExpectEq(os.ModeDir|0754, fi.Mode())
+	ExpectEq(os.ModeDir|applyUmask(0754), fi.Mode())
 	ExpectThat(fi, fusetesting.MtimeIs(createTime))
 	ExpectThat(fi, fusetesting.BirthtimeIs(createTime))
 	ExpectTrue(fi.IsDir())
@@ -275,7 +278,7 @@ func (t *MemFSTest) Mkdir_TwoLevels() {
 
 	fi = entries[0]
 	ExpectEq("dir", fi.Name())
-	ExpectEq(os.ModeDir|0754, fi.Mode())
+	ExpectEq(os.ModeDir|applyUmask(0754), fi.Mode())
 }
 
 func (t *MemFSTest) Mkdir_AlreadyExists() {
@@ -357,7 +360,7 @@ func (t *MemFSTest) CreateNewFile_InRoot() {
 	AssertEq(nil, err)
 	ExpectEq("foo", fi.Name())
 	ExpectEq(len(contents), fi.Size())
-	ExpectEq(0400, fi.Mode())
+	ExpectEq(applyUmask(0400), fi.Mode())
 	ExpectThat(fi, fusetesting.MtimeIs(createTime))
 	ExpectThat(fi, fusetesting.BirthtimeIs(createTime))
 	ExpectFalse(fi.IsDir())
@@ -402,7 +405,7 @@ func (t *MemFSTest) CreateNewFile_InSubDir() {
 	AssertEq(nil, err)
 	ExpectEq("foo", fi.Name())
 	ExpectEq(len(contents), fi.Size())
-	ExpectEq(0400, fi.Mode())
+	ExpectEq(applyUmask(0400), fi.Mode())
 	ExpectThat(fi, fusetesting.MtimeIs(createTime))
 	ExpectThat(fi, fusetesting.BirthtimeIs(createTime))
 	ExpectFalse(fi.IsDir())
@@ -455,7 +458,7 @@ func (t *MemFSTest) ModifyExistingFile_InRoot() {
 	AssertEq(nil, err)
 	ExpectEq("foo", fi.Name())
 	ExpectEq(len("Hello, world!"), fi.Size())
-	ExpectEq(0600, fi.Mode())
+	ExpectEq(applyUmask(0600), fi.Mode())
 	ExpectThat(fi, fusetesting.MtimeIs(modifyTime))
 	ExpectThat(fi, fusetesting.BirthtimeIs(createTime))
 	ExpectFalse(fi.IsDir())
@@ -513,7 +516,7 @@ func (t *MemFSTest) ModifyExistingFile_InSubDir() {
 	AssertEq(nil, err)
 	ExpectEq("foo", fi.Name())
 	ExpectEq(len("Hello, world!"), fi.Size())
-	ExpectEq(0600, fi.Mode())
+	ExpectEq(applyUmask(0600), fi.Mode())
 	ExpectThat(fi, fusetesting.MtimeIs(modifyTime))
 	ExpectThat(fi, fusetesting.BirthtimeIs(createTime))
 	ExpectFalse(fi.IsDir())
@@ -1059,7 +1062,7 @@ func (t *MemFSTest) Chmod() {
 	// Stat it.
 	fi, err := os.Stat(fileName)
 	AssertEq(nil, err)
-	ExpectEq(os.FileMode(0754), fi.Mode())
+	ExpectEq(applyUmask(0754), fi.Mode())
 }
 
 func (t *MemFSTest) Chtimes() {