summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Cyiza <jpcyiza@gitlab.com>2023-03-13 15:27:04 +0100
committerPatrick Cyiza <jpcyiza@gitlab.com>2023-03-15 14:53:05 +0100
commit2cc92f02b8690368b004938e92f7cf4133745eb0 (patch)
treee55f828e971f00c510bae38ef00687a62c497a75
parent1461d9ed1283f6dda015e3c26189b70c95d022c2 (diff)
downloadgitlab-shell-2cc92f02b8690368b004938e92f7cf4133745eb0.tar.gz
Configure Gitaly storage acceptance tests
-rw-r--r--cmd/gitlab-sshd/acceptance_test.go1
-rw-r--r--internal/testhelper/testdata/testroot/responses/allowed_without_console_messages.json2
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/"],