From b58bb03e956e4a0196818d764ac5dc4fc87d8bad Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 15 Jun 2020 21:27:40 +0100 Subject: [PATCH] test: Don't run unreliable tests on CI #4171 --- backend/cache/cache_internal_test.go | 3 +++ fs/accounting/stats_groups_test.go | 3 +++ fs/rc/jobs/job_test.go | 3 +++ lib/pool/pool_test.go | 8 +++++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/cache/cache_internal_test.go b/backend/cache/cache_internal_test.go index 60f27e9f6..2f13340f9 100644 --- a/backend/cache/cache_internal_test.go +++ b/backend/cache/cache_internal_test.go @@ -33,6 +33,7 @@ import ( "github.com/rclone/rclone/fs/object" "github.com/rclone/rclone/fs/rc" "github.com/rclone/rclone/fstest" + "github.com/rclone/rclone/fstest/testy" "github.com/rclone/rclone/lib/random" "github.com/rclone/rclone/vfs" "github.com/rclone/rclone/vfs/vfsflags" @@ -299,6 +300,7 @@ func TestInternalRemoteWrittenFileFoundInMount(t *testing.T) { } func TestInternalCachedWrittenContentMatches(t *testing.T) { + testy.SkipUnreliable(t) id := fmt.Sprintf("ticwcm%v", time.Now().Unix()) rootFs, boltDb := runInstance.newCacheFs(t, remoteName, id, false, true, nil, nil) defer runInstance.cleanupFs(t, rootFs, boltDb) @@ -342,6 +344,7 @@ func TestInternalDoubleWrittenContentMatches(t *testing.T) { } func TestInternalCachedUpdatedContentMatches(t *testing.T) { + testy.SkipUnreliable(t) id := fmt.Sprintf("ticucm%v", time.Now().Unix()) rootFs, boltDb := runInstance.newCacheFs(t, remoteName, id, false, true, nil, nil) defer runInstance.cleanupFs(t, rootFs, boltDb) diff --git a/fs/accounting/stats_groups_test.go b/fs/accounting/stats_groups_test.go index b61f6fabd..76d93bf64 100644 --- a/fs/accounting/stats_groups_test.go +++ b/fs/accounting/stats_groups_test.go @@ -4,6 +4,8 @@ import ( "fmt" "runtime" "testing" + + "github.com/rclone/rclone/fstest/testy" ) func TestStatsGroupOperations(t *testing.T) { @@ -71,6 +73,7 @@ func TestStatsGroupOperations(t *testing.T) { }) t.Run("memory is reclaimed", func(t *testing.T) { + testy.SkipUnreliable(t) var ( count = 1000 start, end runtime.MemStats diff --git a/fs/rc/jobs/job_test.go b/fs/rc/jobs/job_test.go index fd40a44be..4126c32f9 100644 --- a/fs/rc/jobs/job_test.go +++ b/fs/rc/jobs/job_test.go @@ -9,6 +9,7 @@ import ( "github.com/pkg/errors" "github.com/rclone/rclone/fs/rc" "github.com/rclone/rclone/fs/rc/rcflags" + "github.com/rclone/rclone/fstest/testy" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -19,6 +20,7 @@ func TestNewJobs(t *testing.T) { } func TestJobsKickExpire(t *testing.T) { + testy.SkipUnreliable(t) jobs := newJobs() jobs.opt.JobExpireInterval = time.Millisecond assert.Equal(t, false, jobs.expireRunning) @@ -33,6 +35,7 @@ func TestJobsKickExpire(t *testing.T) { } func TestJobsExpire(t *testing.T) { + testy.SkipUnreliable(t) wait := make(chan struct{}) jobs := newJobs() jobs.opt.JobExpireInterval = time.Millisecond diff --git a/lib/pool/pool_test.go b/lib/pool/pool_test.go index 04b46834a..90b0e03fa 100644 --- a/lib/pool/pool_test.go +++ b/lib/pool/pool_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/rclone/rclone/fstest/testy" "github.com/stretchr/testify/assert" ) @@ -215,7 +216,12 @@ func TestPool(t *testing.T) { } { t.Run(test.name, func(t *testing.T) { t.Run("GetPut", func(t *testing.T) { testGetPut(t, test.useMmap, test.unreliable) }) - t.Run("Flusher", func(t *testing.T) { testFlusher(t, test.useMmap, test.unreliable) }) + t.Run("Flusher", func(t *testing.T) { + if test.name == "canFail" { + testy.SkipUnreliable(t) // fails regularly on macOS + } + testFlusher(t, test.useMmap, test.unreliable) + }) }) } }