diff options
Diffstat (limited to 'internal/service/repository/repository_test.go')
| -rw-r--r-- | internal/service/repository/repository_test.go | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/internal/service/repository/repository_test.go b/internal/service/repository/repository_test.go index 0a50c0883..71bd74435 100644 --- a/internal/service/repository/repository_test.go +++ b/internal/service/repository/repository_test.go @@ -16,27 +16,22 @@ import ( ) func TestRepositoryExists(t *testing.T) { - serverSocketPath, stop := runRepoServer(t, testhelper.WithStorages([]string{"default", "other", "broken"})) - defer stop() - + // Setup storage paths storageOtherDir, err := ioutil.TempDir("", "gitaly-repository-exists-test") require.NoError(t, err, "tempdir") defer os.Remove(storageOtherDir) - client, conn := newRepositoryClient(t, serverSocketPath) - defer conn.Close() - - // Setup storage paths testStorages := []config.Storage{ {Name: "default", Path: testhelper.GitlabTestStoragePath()}, {Name: "other", Path: storageOtherDir}, {Name: "broken", Path: "/does/not/exist"}, } - defer func(oldStorages []config.Storage) { - config.Config.Storages = oldStorages - }(config.Config.Storages) - config.Config.Storages = testStorages + serverSocketPath, stop := runRepoServer(t, testStorages) + defer stop() + + client, conn := newRepositoryClient(t, serverSocketPath) + defer conn.Close() queries := []struct { desc string @@ -122,7 +117,7 @@ func TestRepositoryExists(t *testing.T) { } func TestSuccessfulHasLocalBranches(t *testing.T) { - serverSocketPath, stop := runRepoServer(t) + serverSocketPath, stop := runRepoServer(t, config.Config.Storages) defer stop() client, conn := newRepositoryClient(t, serverSocketPath) @@ -177,7 +172,7 @@ func TestSuccessfulHasLocalBranches(t *testing.T) { } func TestFailedHasLocalBranches(t *testing.T) { - serverSocketPath, stop := runRepoServer(t) + serverSocketPath, stop := runRepoServer(t, config.Config.Storages) defer stop() client, conn := newRepositoryClient(t, serverSocketPath) |