forked from TrueCloudLab/rclone
build: disable cmount tests under macOS and the CI since they are locking up
This fixes #5951 and allows the macOS builds to run again See #5960 for more info.
This commit is contained in:
parent
5826cc9d9e
commit
83b6b62c1b
3 changed files with 16 additions and 0 deletions
|
@ -10,11 +10,17 @@
|
||||||
package cmount
|
package cmount
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"runtime"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/rclone/rclone/fstest/testy"
|
||||||
"github.com/rclone/rclone/vfs/vfstest"
|
"github.com/rclone/rclone/vfs/vfstest"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMount(t *testing.T) {
|
func TestMount(t *testing.T) {
|
||||||
|
// Disable tests under macOS and the CI since they are locking up
|
||||||
|
if runtime.GOOS == "darwin" {
|
||||||
|
testy.SkipUnreliable(t)
|
||||||
|
}
|
||||||
vfstest.RunTests(t, false, mount)
|
vfstest.RunTests(t, false, mount)
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,11 +16,16 @@ import (
|
||||||
"github.com/rclone/rclone/cmd/mountlib"
|
"github.com/rclone/rclone/cmd/mountlib"
|
||||||
"github.com/rclone/rclone/fs/config/configfile"
|
"github.com/rclone/rclone/fs/config/configfile"
|
||||||
"github.com/rclone/rclone/fs/rc"
|
"github.com/rclone/rclone/fs/rc"
|
||||||
|
"github.com/rclone/rclone/fstest/testy"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestRc(t *testing.T) {
|
func TestRc(t *testing.T) {
|
||||||
|
// Disable tests under macOS and the CI since they are locking up
|
||||||
|
if runtime.GOOS == "darwin" {
|
||||||
|
testy.SkipUnreliable(t)
|
||||||
|
}
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
configfile.Install()
|
configfile.Install()
|
||||||
mount := rc.Calls.Get("mount/mount")
|
mount := rc.Calls.Get("mount/mount")
|
||||||
|
|
|
@ -23,6 +23,7 @@ import (
|
||||||
"github.com/rclone/rclone/fs"
|
"github.com/rclone/rclone/fs"
|
||||||
"github.com/rclone/rclone/fs/config"
|
"github.com/rclone/rclone/fs/config"
|
||||||
"github.com/rclone/rclone/fstest"
|
"github.com/rclone/rclone/fstest"
|
||||||
|
"github.com/rclone/rclone/fstest/testy"
|
||||||
"github.com/rclone/rclone/lib/file"
|
"github.com/rclone/rclone/lib/file"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
@ -303,6 +304,10 @@ func (a *APIClient) request(path string, in, out interface{}, wantErr bool) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func testMountAPI(t *testing.T, sockAddr string) {
|
func testMountAPI(t *testing.T, sockAddr string) {
|
||||||
|
// Disable tests under macOS and the CI since they are locking up
|
||||||
|
if runtime.GOOS == "darwin" {
|
||||||
|
testy.SkipUnreliable(t)
|
||||||
|
}
|
||||||
if _, mountFn := mountlib.ResolveMountMethod(""); mountFn == nil {
|
if _, mountFn := mountlib.ResolveMountMethod(""); mountFn == nil {
|
||||||
t.Skip("Test requires working mount command")
|
t.Skip("Test requires working mount command")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue