diff --git a/cmd/cmount/mount_test.go b/cmd/cmount/mount_test.go index 7cf18971e..571913954 100644 --- a/cmd/cmount/mount_test.go +++ b/cmd/cmount/mount_test.go @@ -5,38 +5,31 @@ package cmount import ( - "runtime" "testing" "github.com/ncw/rclone/cmd/mountlib/mounttest" ) -func notWin(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("not running on windows") - } -} - func TestMain(m *testing.M) { mounttest.TestMain(m, mount) } func TestDirLs(t *testing.T) { mounttest.TestDirLs(t) } -func TestDirCreateAndRemoveDir(t *testing.T) { notWin(t); mounttest.TestDirCreateAndRemoveDir(t) } -func TestDirCreateAndRemoveFile(t *testing.T) { notWin(t); mounttest.TestDirCreateAndRemoveFile(t) } -func TestDirRenameFile(t *testing.T) { notWin(t); mounttest.TestDirRenameFile(t) } -func TestDirRenameEmptyDir(t *testing.T) { notWin(t); mounttest.TestDirRenameEmptyDir(t) } -func TestDirRenameFullDir(t *testing.T) { notWin(t); mounttest.TestDirRenameFullDir(t) } -func TestDirModTime(t *testing.T) { notWin(t); mounttest.TestDirModTime(t) } -func TestDirCacheFlush(t *testing.T) { notWin(t); mounttest.TestDirCacheFlush(t) } -func TestDirCacheFlushOnDirRename(t *testing.T) { notWin(t); mounttest.TestDirCacheFlushOnDirRename(t) } -func TestFileModTime(t *testing.T) { notWin(t); mounttest.TestFileModTime(t) } +func TestDirCreateAndRemoveDir(t *testing.T) { mounttest.TestDirCreateAndRemoveDir(t) } +func TestDirCreateAndRemoveFile(t *testing.T) { mounttest.TestDirCreateAndRemoveFile(t) } +func TestDirRenameFile(t *testing.T) { mounttest.TestDirRenameFile(t) } +func TestDirRenameEmptyDir(t *testing.T) { mounttest.TestDirRenameEmptyDir(t) } +func TestDirRenameFullDir(t *testing.T) { mounttest.TestDirRenameFullDir(t) } +func TestDirModTime(t *testing.T) { mounttest.TestDirModTime(t) } +func TestDirCacheFlush(t *testing.T) { mounttest.TestDirCacheFlush(t) } +func TestDirCacheFlushOnDirRename(t *testing.T) { mounttest.TestDirCacheFlushOnDirRename(t) } +func TestFileModTime(t *testing.T) { mounttest.TestFileModTime(t) } func TestFileModTimeWithOpenWriters(t *testing.T) {} // FIXME mounttest.TestFileModTimeWithOpenWriters(t) -func TestMount(t *testing.T) { notWin(t); mounttest.TestMount(t) } -func TestRoot(t *testing.T) { notWin(t); mounttest.TestRoot(t) } -func TestReadByByte(t *testing.T) { notWin(t); mounttest.TestReadByByte(t) } -func TestReadChecksum(t *testing.T) { notWin(t); mounttest.TestReadChecksum(t) } -func TestReadFileDoubleClose(t *testing.T) { notWin(t); mounttest.TestReadFileDoubleClose(t) } -func TestReadSeek(t *testing.T) { notWin(t); mounttest.TestReadSeek(t) } -func TestWriteFileNoWrite(t *testing.T) { notWin(t); mounttest.TestWriteFileNoWrite(t) } -func TestWriteFileWrite(t *testing.T) { notWin(t); mounttest.TestWriteFileWrite(t) } -func TestWriteFileOverwrite(t *testing.T) { notWin(t); mounttest.TestWriteFileOverwrite(t) } -func TestWriteFileDoubleClose(t *testing.T) { notWin(t); mounttest.TestWriteFileDoubleClose(t) } -func TestWriteFileFsync(t *testing.T) { notWin(t); mounttest.TestWriteFileFsync(t) } +func TestMount(t *testing.T) { mounttest.TestMount(t) } +func TestRoot(t *testing.T) { mounttest.TestRoot(t) } +func TestReadByByte(t *testing.T) { mounttest.TestReadByByte(t) } +func TestReadChecksum(t *testing.T) { mounttest.TestReadChecksum(t) } +func TestReadFileDoubleClose(t *testing.T) { mounttest.TestReadFileDoubleClose(t) } +func TestReadSeek(t *testing.T) { mounttest.TestReadSeek(t) } +func TestWriteFileNoWrite(t *testing.T) { mounttest.TestWriteFileNoWrite(t) } +func TestWriteFileWrite(t *testing.T) { mounttest.TestWriteFileWrite(t) } +func TestWriteFileOverwrite(t *testing.T) { mounttest.TestWriteFileOverwrite(t) } +func TestWriteFileDoubleClose(t *testing.T) { mounttest.TestWriteFileDoubleClose(t) } +func TestWriteFileFsync(t *testing.T) { mounttest.TestWriteFileFsync(t) } diff --git a/cmd/mountlib/mounttest/fs.go b/cmd/mountlib/mounttest/fs.go index dd53b0bb2..a6c3af98f 100644 --- a/cmd/mountlib/mounttest/fs.go +++ b/cmd/mountlib/mounttest/fs.go @@ -339,6 +339,9 @@ func (r *Run) rmdir(t *testing.T, filepath string) { // is in the mount output func TestMount(t *testing.T) { run.skipIfNoFUSE(t) + if runtime.GOOS == "windows" { + t.Skip("not running on windows") + } out, err := exec.Command("mount").Output() require.NoError(t, err)