diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-07-22 21:53:02 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-07-22 21:58:48 +0300 |
| commit | 90f55c194f4a3d66ab7d33601f682405c129de5a (patch) | |
| tree | 4f4f126d1d346c2185ee950358589101ac8182b7 | |
| parent | 73bbd36a1fc9e2c822eaafc3cea71c16b9a7df75 (diff) | |
housekeeping: Fix test with SHA256 on macOS
The `CleanStaleData_unsetConfigurationTransactional` test expects config
paraemeters in the wrong order when run on macOS and SHA256 repositories
enabled. Fix the order so SHA256 test runs pass on macOS.
| -rw-r--r-- | internal/git/housekeeping/clean_stale_data_test.go | 8 |
1 files changed, 4 insertions, 4 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)) } |