From 77f466b1d5a0d49c9efa18c9e73366d452d185cf Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Tue, 19 Jul 2022 19:45:08 +0400 Subject: [PATCH] [#569] Fix tests Signed-off-by: Angira Kekteeva --- api/cache/cache_test.go | 2 +- api/handler/handlers_test.go | 2 +- api/handler/locking_test.go | 2 +- api/layer/locking_test.go | 2 +- api/layer/versioning_test.go | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/cache/cache_test.go b/api/cache/cache_test.go index 0f66215a..0db074a1 100644 --- a/api/cache/cache_test.go +++ b/api/cache/cache_test.go @@ -153,7 +153,7 @@ func TestSettingsCacheType(t *testing.T) { cache := NewSystemCache(DefaultSystemConfig(logger)) key := "key" - settings := &data.BucketSettings{VersioningEnabled: true} + settings := &data.BucketSettings{Versioning: data.VerEnabled} err := cache.PutSettings(key, settings) require.NoError(t, err) diff --git a/api/handler/handlers_test.go b/api/handler/handlers_test.go index 72244a57..9ab09f00 100644 --- a/api/handler/handlers_test.go +++ b/api/handler/handlers_test.go @@ -109,7 +109,7 @@ func createTestBucketWithLock(ctx context.Context, t *testing.T, h *handlerConte sp := &layer.PutSettingsParams{ BktInfo: bktInfo, Settings: &data.BucketSettings{ - VersioningEnabled: true, + Versioning: data.VerEnabled, LockConfiguration: conf, }, } diff --git a/api/handler/locking_test.go b/api/handler/locking_test.go index 06112cde..17e08823 100644 --- a/api/handler/locking_test.go +++ b/api/handler/locking_test.go @@ -324,7 +324,7 @@ func TestPutBucketLockConfigurationHandler(t *testing.T) { bktSettings, err := hc.Layer().GetBucketSettings(ctx, bktInfo) require.NoError(t, err) actualConf := bktSettings.LockConfiguration - require.True(t, bktSettings.VersioningEnabled) + require.True(t, bktSettings.VersioningEnabled()) require.Equal(t, tc.configuration.ObjectLockEnabled, actualConf.ObjectLockEnabled) require.Equal(t, tc.configuration.Rule, actualConf.Rule) }) diff --git a/api/layer/locking_test.go b/api/layer/locking_test.go index f5abdd55..3c257d54 100644 --- a/api/layer/locking_test.go +++ b/api/layer/locking_test.go @@ -12,7 +12,7 @@ func TestObjectLockAttributes(t *testing.T) { tc := prepareContext(t) err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ BktInfo: tc.bktInfo, - Settings: &data.BucketSettings{VersioningEnabled: true}, + Settings: &data.BucketSettings{Versioning: data.VerEnabled}, }) require.NoError(t, err) diff --git a/api/layer/versioning_test.go b/api/layer/versioning_test.go index ab3626a5..46cbd7c0 100644 --- a/api/layer/versioning_test.go +++ b/api/layer/versioning_test.go @@ -183,7 +183,7 @@ func TestSimpleVersioning(t *testing.T) { tc := prepareContext(t) err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ BktInfo: tc.bktInfo, - Settings: &data.BucketSettings{VersioningEnabled: true}, + Settings: &data.BucketSettings{Versioning: data.VerEnabled}, }) require.NoError(t, err) @@ -220,7 +220,7 @@ func TestSimpleNoVersioning(t *testing.T) { func TestVersioningDeleteObject(t *testing.T) { tc := prepareContext(t) - settings := &data.BucketSettings{VersioningEnabled: true} + settings := &data.BucketSettings{Versioning: data.VerEnabled} err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ BktInfo: tc.bktInfo, Settings: settings, @@ -242,7 +242,7 @@ func TestGetUnversioned(t *testing.T) { objContent := []byte("content obj1 v1") objInfo := tc.putObject(objContent) - settings := &data.BucketSettings{VersioningEnabled: false} + settings := &data.BucketSettings{Versioning: data.VerUnversioned} err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ BktInfo: tc.bktInfo, Settings: settings, @@ -256,7 +256,7 @@ func TestGetUnversioned(t *testing.T) { func TestVersioningDeleteSpecificObjectVersion(t *testing.T) { tc := prepareContext(t) - settings := &data.BucketSettings{VersioningEnabled: true} + settings := &data.BucketSettings{Versioning: data.VerEnabled} err := tc.layer.PutBucketSettings(tc.ctx, &PutSettingsParams{ BktInfo: tc.bktInfo, Settings: settings,