From 69fdcd4300e53549eab18d9e728950236c0437f1 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Thu, 27 Jan 2022 09:38:24 +0000 Subject: [PATCH] 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. --- cmd/cmount/mount_test.go | 6 ++++++ cmd/mountlib/rc_test.go | 5 +++++ cmd/serve/docker/docker_test.go | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/cmd/cmount/mount_test.go b/cmd/cmount/mount_test.go index f57119410..f652c69ed 100644 --- a/cmd/cmount/mount_test.go +++ b/cmd/cmount/mount_test.go @@ -10,11 +10,17 @@ package cmount import ( + "runtime" "testing" + "github.com/rclone/rclone/fstest/testy" "github.com/rclone/rclone/vfs/vfstest" ) 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) } diff --git a/cmd/mountlib/rc_test.go b/cmd/mountlib/rc_test.go index 203269901..030a89a5a 100644 --- a/cmd/mountlib/rc_test.go +++ b/cmd/mountlib/rc_test.go @@ -16,11 +16,16 @@ import ( "github.com/rclone/rclone/cmd/mountlib" "github.com/rclone/rclone/fs/config/configfile" "github.com/rclone/rclone/fs/rc" + "github.com/rclone/rclone/fstest/testy" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) 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() configfile.Install() mount := rc.Calls.Get("mount/mount") diff --git a/cmd/serve/docker/docker_test.go b/cmd/serve/docker/docker_test.go index 3c4564041..9e7ae1da9 100644 --- a/cmd/serve/docker/docker_test.go +++ b/cmd/serve/docker/docker_test.go @@ -23,6 +23,7 @@ import ( "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/config" "github.com/rclone/rclone/fstest" + "github.com/rclone/rclone/fstest/testy" "github.com/rclone/rclone/lib/file" "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) { + // 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 { t.Skip("Test requires working mount command") }