diff options
author | James Fargher <jfargher@gitlab.com> | 2024-01-24 01:34:37 +0300 |
---|---|---|
committer | James Fargher <jfargher@gitlab.com> | 2024-01-24 02:55:08 +0300 |
commit | 11198cfe68c5e5660715929ece3c085e55850ae2 (patch) | |
tree | b80bef821498a4489d6ae58b1c25b5f292e51a84 | |
parent | e101aa6f8914a98b298a68dca13d5a3e85d15e80 (diff) |
backup: Run backup tests in sha256 mode
Now that all backups use manifests they can be run on sha256
repositories.
-rw-r--r-- | internal/backup/backup_test.go | 10 | ||||
-rw-r--r-- | internal/backup/server_side_test.go | 6 | ||||
-rw-r--r-- | internal/gitaly/service/repository/restore_repository_test.go | 6 |
3 files changed, 6 insertions, 16 deletions
diff --git a/internal/backup/backup_test.go b/internal/backup/backup_test.go index 1b8d5c62a..79c4cc2d5 100644 --- a/internal/backup/backup_test.go +++ b/internal/backup/backup_test.go @@ -556,8 +556,6 @@ func TestManager_Create_incremental(t *testing.T) { } func TestManager_Restore_latest(t *testing.T) { - gittest.SkipWithSHA256(t) - t.Parallel() cfg := testcfg.Build(t) @@ -994,8 +992,6 @@ func TestManager_Restore_specific(t *testing.T) { { desc: "single incremental", setup: func(tb testing.TB) (*gitalypb.Repository, *git.Checksum) { - gittest.SkipWithSHA256(tb) // sha256 only works with manifest files - repo, _ := gittest.CreateRepository(tb, ctx, cfg) relativePath := stripRelativePath(tb, repo) @@ -1019,8 +1015,6 @@ custom_hooks_path = '%[2]s/%[3]s/001.custom_hooks.tar' { desc: "many incrementals", setup: func(tb testing.TB) (*gitalypb.Repository, *git.Checksum) { - gittest.SkipWithSHA256(tb) // sha256 only works with manifest files - _, expectedRepoPath := gittest.CreateRepository(tb, ctx, cfg) repo, _ := gittest.CreateRepository(tb, ctx, cfg) @@ -1203,8 +1197,6 @@ custom_hooks_path = 'custom_hooks.tar' } func TestManager_CreateRestore_contextServerInfo(t *testing.T) { - gittest.SkipWithSHA256(t) - t.Parallel() cfg := testcfg.Build(t) @@ -1242,8 +1234,6 @@ func TestManager_CreateRestore_contextServerInfo(t *testing.T) { } func TestResolveLocator(t *testing.T) { - gittest.SkipWithSHA256(t) - t.Parallel() for _, tc := range []struct { diff --git a/internal/backup/server_side_test.go b/internal/backup/server_side_test.go index 69669df60..eedbed3cd 100644 --- a/internal/backup/server_side_test.go +++ b/internal/backup/server_side_test.go @@ -23,8 +23,6 @@ import ( ) func TestServerSideAdapter_Create(t *testing.T) { - gittest.SkipWithSHA256(t) - t.Parallel() ctx := testhelper.Context(t) @@ -148,8 +146,6 @@ func TestServerSideAdapter_Create(t *testing.T) { } func TestServerSideAdapter_Restore(t *testing.T) { - gittest.SkipWithSHA256(t) - t.Parallel() ctx := testhelper.Context(t) @@ -191,6 +187,8 @@ func TestServerSideAdapter_Restore(t *testing.T) { require.NoError(t, err) require.NoError(t, w.Close()) + backup.ObjectFormat = gittest.DefaultObjectHash.Format + require.NoError(t, backupLocator.Commit(ctx, backup)) return setupData{ diff --git a/internal/gitaly/service/repository/restore_repository_test.go b/internal/gitaly/service/repository/restore_repository_test.go index ce56ec877..8bd55285c 100644 --- a/internal/gitaly/service/repository/restore_repository_test.go +++ b/internal/gitaly/service/repository/restore_repository_test.go @@ -16,8 +16,6 @@ import ( ) func TestRestoreRepository(t *testing.T) { - gittest.SkipWithSHA256(t) - t.Parallel() ctx := testhelper.Context(t) @@ -66,6 +64,8 @@ func TestRestoreRepository(t *testing.T) { require.NoError(t, err) require.NoError(t, w.Close()) + backup.ObjectFormat = gittest.DefaultObjectHash.Format + require.NoError(t, backupLocator.Commit(ctx, backup)) return setupData{ @@ -109,6 +109,8 @@ func TestRestoreRepository(t *testing.T) { require.NoError(t, err) require.NoError(t, w.Close()) + backup.ObjectFormat = gittest.DefaultObjectHash.Format + require.NoError(t, backupLocator.Commit(ctx, backup)) return setupData{ |