diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2023-03-15 14:11:09 +0000 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2023-03-15 14:11:09 +0000 |
| commit | da4a4d774fd8d5396dd53ed077789c380a44476f (patch) | |
| tree | e55f828e971f00c510bae38ef00687a62c497a75 | |
| parent | 1461d9ed1283f6dda015e3c26189b70c95d022c2 (diff) | |
| parent | 2cc92f02b8690368b004938e92f7cf4133745eb0 (diff) | |
| download | gitlab-shell-da4a4d774fd8d5396dd53ed077789c380a44476f.tar.gz | |
Merge branch '622-configure-gitaly-storage-dynamically-for-acceptance-tests' into 'main'
Configure Gitaly storage acceptance tests
Closes #622
See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/723
Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Patrick Cyiza <jpcyiza@gitlab.com>
| -rw-r--r-- | cmd/gitlab-sshd/acceptance_test.go | 1 | ||||
| -rw-r--r-- | internal/testhelper/testdata/testroot/responses/allowed_without_console_messages.json | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd/gitlab-sshd/acceptance_test.go b/cmd/gitlab-sshd/acceptance_test.go index af263c8..d890669 100644 --- a/cmd/gitlab-sshd/acceptance_test.go +++ b/cmd/gitlab-sshd/acceptance_test.go @@ -118,6 +118,7 @@ func successAPI(t *testing.T) http.Handler { if gitalyConnInfo != nil { response = strings.Replace(response, "GITALY_ADDRESS", gitalyConnInfo.Address, 1) + response = strings.Replace(response, "GITALY_STORAGE", gitalyConnInfo.Storage, 1) } fmt.Fprint(w, response) diff --git a/internal/testhelper/testdata/testroot/responses/allowed_without_console_messages.json b/internal/testhelper/testdata/testroot/responses/allowed_without_console_messages.json index 6a865db..1464734 100644 --- a/internal/testhelper/testdata/testroot/responses/allowed_without_console_messages.json +++ b/internal/testhelper/testdata/testroot/responses/allowed_without_console_messages.json @@ -7,7 +7,7 @@ "git_config_options": [], "gitaly": { "repository": { - "storage_name": "default", + "storage_name": "GITALY_STORAGE", "relative_path": "GITALY_REPOSITORY", "git_object_directory": "objects/", "git_alternate_object_directories": ["objects/"], |