diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-07-24 09:01:38 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-07-24 09:01:38 +0300 |
| commit | 53789d6649646c744f96d4379f34c8694bfcd374 (patch) | |
| tree | 4f4f126d1d346c2185ee950358589101ac8182b7 | |
| parent | f3cdaf43c4fb455513ad5f6197c2b5f51b9deced (diff) | |
| parent | 90f55c194f4a3d66ab7d33601f682405c129de5a (diff) | |
Merge branch 'jt-fix-macos-sha256' into 'master'
tests: Fix tests with SHA256 on macOS
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6112
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: Justin Tobler <jtobler@gitlab.com>
| -rw-r--r-- | internal/git/housekeeping/clean_stale_data_test.go | 8 | ||||
| -rw-r--r-- | internal/gitaly/service/repository/config_test.go | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/internal/git/housekeeping/clean_stale_data_test.go b/internal/git/housekeeping/clean_stale_data_test.go index fcc655922..e86cc55eb 100644 --- a/internal/git/housekeeping/clean_stale_data_test.go +++ b/internal/git/housekeeping/clean_stale_data_test.go @@ -1197,13 +1197,13 @@ func TestRepositoryManager_CleanStaleData_unsetConfigurationTransactional(t *tes expectedConfig := "core.repositoryformatversion\ncore.filemode\ncore.bare\n" - if gittest.DefaultObjectHash.Format == "sha256" { - expectedConfig = expectedConfig + "extensions.objectformat\n" - } - if runtime.GOOS == "darwin" { expectedConfig = expectedConfig + "core.ignorecase\ncore.precomposeunicode\n" } + + if gittest.DefaultObjectHash.Format == "sha256" { + expectedConfig = expectedConfig + "extensions.objectformat\n" + } require.Equal(t, expectedConfig, string(configKeys)) } diff --git a/internal/gitaly/service/repository/config_test.go b/internal/gitaly/service/repository/config_test.go index 91f357938..2d04b0f2e 100644 --- a/internal/gitaly/service/repository/config_test.go +++ b/internal/gitaly/service/repository/config_test.go @@ -52,14 +52,16 @@ func TestGetConfig(t *testing.T) { config, err := getConfig(t, client, repo) require.NoError(t, err) + var darwinConfig string + if runtime.GOOS == "darwin" { + darwinConfig = "\tignorecase = true\n\tprecomposeunicode = true\n" + } + expectedConfig := gittest.ObjectHashDependent(t, map[string]string{ - "sha1": "[core]\n\trepositoryformatversion = 0\n\tfilemode = true\n\tbare = true\n", - "sha256": "[core]\n\trepositoryformatversion = 1\n\tfilemode = true\n\tbare = true\n[extensions]\n\tobjectformat = sha256\n", + "sha1": "[core]\n\trepositoryformatversion = 0\n\tfilemode = true\n\tbare = true\n" + darwinConfig, + "sha256": "[core]\n\trepositoryformatversion = 1\n\tfilemode = true\n\tbare = true\n" + darwinConfig + "[extensions]\n\tobjectformat = sha256\n", }) - if runtime.GOOS == "darwin" { - expectedConfig = expectedConfig + "\tignorecase = true\n\tprecomposeunicode = true\n" - } require.Equal(t, expectedConfig, config) }) |