From dc18ecd9b475ee213402910d8876873b04363c7c Mon Sep 17 00:00:00 2001 From: Ben Brooks Date: Wed, 17 Jul 2024 17:18:28 +0100 Subject: [PATCH] Skip the 4 failing tests in non-xattr because they rely on them --- db/import_test.go | 8 ++++++++ rest/changes_test.go | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/db/import_test.go b/db/import_test.go index a43990c55f..ae70b182df 100644 --- a/db/import_test.go +++ b/db/import_test.go @@ -894,6 +894,10 @@ func TestMetadataOnlyUpdate(t *testing.T) { } func TestImportResurrectionMou(t *testing.T) { + if !base.TestUseXattrs() { + t.Skip("This test requires xattrs because it relies on import") + } + base.SetUpTestLogging(t, base.LevelInfo, base.KeyMigrate, base.KeyImport, base.KeyCRUD) db, ctx := setupTestDBWithOptionsAndImport(t, nil, DatabaseContextOptions{}) defer db.Close(ctx) @@ -951,6 +955,10 @@ func TestImportResurrectionMou(t *testing.T) { // update, even though it originated with an SDK delete, because the existing non-winning revision body will be // promoted to winning. func TestImportConflictWithTombstone(t *testing.T) { + if !base.TestUseXattrs() { + t.Skip("This test requires xattrs because it relies on import") + } + base.SetUpTestLogging(t, base.LevelInfo, base.KeyMigrate, base.KeyImport, base.KeyCRUD) db, ctx := setupTestDBWithOptionsAndImport(t, nil, DatabaseContextOptions{}) defer db.Close(ctx) diff --git a/rest/changes_test.go b/rest/changes_test.go index 21a069db4e..20525f7b71 100644 --- a/rest/changes_test.go +++ b/rest/changes_test.go @@ -274,6 +274,9 @@ func TestWebhookWinningRevChangedEvent(t *testing.T) { // - Update this doc again, triggering unused sequence range release // - Write another doc and assert that the changes feed returns all expected docs func TestJumpInSequencesAtAllocatorSkippedSequenceFill(t *testing.T) { + if !base.TestUseXattrs() { + t.Skip("This test requires xattrs because it writes directly to the xattr") + } base.SetUpTestLogging(t, base.LevelDebug, base.KeyAll) @@ -342,6 +345,10 @@ func TestJumpInSequencesAtAllocatorSkippedSequenceFill(t *testing.T) { // - Update this doc again, triggering unused sequence range release // - Write another doc and assert that the changes feed returns all expected docs func TestJumpInSequencesAtAllocatorRangeInPending(t *testing.T) { + if !base.TestUseXattrs() { + t.Skip("This test requires xattrs because it writes directly to the xattr") + } + base.SetUpTestLogging(t, base.LevelDebug, base.KeyAll) rt := NewRestTester(t, &RestTesterConfig{