From 690a7ac7835f8093bc38817b5a3a640ce7426000 Mon Sep 17 00:00:00 2001 From: Ivan Andreev Date: Mon, 18 Oct 2021 16:53:29 +0300 Subject: [PATCH] chunker: fix md5all test for no-meta test remotes --- .gitignore | 1 + backend/chunker/chunker_internal_test.go | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ced5f4245..ff61403f3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ fuzz-build.zip *.orig *.rej Thumbs.db +__pycache__ diff --git a/backend/chunker/chunker_internal_test.go b/backend/chunker/chunker_internal_test.go index 2c676abd7..9299305dc 100644 --- a/backend/chunker/chunker_internal_test.go +++ b/backend/chunker/chunker_internal_test.go @@ -695,7 +695,7 @@ func testMetadataInput(t *testing.T, f *Fs) { // Test that chunker refuses to change on objects with future/unknown metadata func testFutureProof(t *testing.T, f *Fs) { - if f.opt.MetaFormat == "none" { + if !f.useMeta { t.Skip("this test requires metadata support") } @@ -865,9 +865,11 @@ func testChunkerServerSideMove(t *testing.T, f *Fs) { func testMD5AllSlow(t *testing.T, f *Fs) { ctx := context.Background() fsResult := deriveFs(ctx, t, f, "md5all", settings{ - "chunk_size": "1P", - "name_format": "*.#", - "hash_type": "md5all", + "chunk_size": "1P", + "name_format": "*.#", + "hash_type": "md5all", + "transactions": "rename", + "meta_format": "simplejson", }) chunkFs, ok := fsResult.(*Fs) require.True(t, ok, "fs must be a chunker remote")