Skip to content

mount: test nitpicks#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kolyshkin merged 2 commits into from
Mar 17, 2020
Merged

mount: test nitpicks #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aa8110
mount: test nitpicks
kolyshkin Mar 15, 2020
e12352f
mount: fix test for added relatime
kolyshkin Mar 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions mount/mount_unix_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
package mount

import (
"io/ioutil"
"os"
"path"
"testing"
Expand DownExpand Up@@ -44,21 +45,20 @@ func TestMounted(t *testing.T) {
targetPath = path.Join(targetDir, "file.txt")
)

os.Mkdir(sourceDir, 0777)
os.Mkdir(targetDir, 0777)
if err := os.Mkdir(sourceDir, 0777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(targetDir, 0777); err != nil {
t.Fatal(err)
}

f, err := os.Create(sourcePath)
if err != nil {
if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil {
t.Fatal(err)
}
f.WriteString("hello")
f.Close()

f, err = os.Create(targetPath)
if err != nil {
if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil {
t.Fatal(err)
}
f.Close()

if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil {
t.Fatal(err)
Expand DownExpand Up@@ -99,21 +99,20 @@ func TestMountReadonly(t *testing.T) {
targetPath = path.Join(targetDir, "file.txt")
)

os.Mkdir(sourceDir, 0777)
os.Mkdir(targetDir, 0777)
if err := os.Mkdir(sourceDir, 0777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(targetDir, 0777); err != nil {
t.Fatal(err)
}

f, err := os.Create(sourcePath)
if err != nil {
if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil {
t.Fatal(err)
}
f.WriteString("hello")
f.Close()

f, err = os.Create(targetPath)
if err != nil {
if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil {
t.Fatal(err)
}
f.Close()

if err := Mount(sourceDir, targetDir, "none", "bind,ro"); err != nil {
t.Fatal(err)
Expand All@@ -124,8 +123,7 @@ func TestMountReadonly(t *testing.T) {
}
}()

_, err = os.OpenFile(targetPath, os.O_RDWR, 0777)
if err == nil {
if err := ioutil.WriteFile(targetPath, []byte("hello"), 0644); err == nil {
t.Fatal("Should not be able to open a ro file as rw")
}
}
Expand Down
2 changes: 1 addition & 1 deletion mount/mounter_linux_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,7 +172,7 @@ func validateMount(t *testing.T, mnt string, opts, optional, vfs string) {
if mi.Opts != "" {
for _, opt := range strings.Split(mi.Opts, ",") {
opt = clean(opt)
if !has(wantedOpts, opt) && !has(pOpts, opt) {
if !has(wantedOpts, opt) && !has(pOpts, opt) && opt != "relatime" {
t.Errorf("unexpected mount option %q, expected %q", opt, opts)
}
delete(wantedOpts, opt)
Expand Down
8 changes: 2 additions & 6 deletions mount/sharedsubtree_linux_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ package mount

import (
"errors"
"io/ioutil"
"os"
"path"
"testing"
Expand DownExpand Up@@ -340,10 +341,5 @@ func TestSubtreeUnbindable(t *testing.T) {
}

func createFile(path string) error {
f, err := os.Create(path)
if err != nil {
return err
}
f.WriteString("hello world!")
return f.Close()
return ioutil.WriteFile(path, []byte("hello"), 0666)
}