diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2019-06-04 15:38:58 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-06-04 15:38:58 +0300 |
commit | f99e8e787a08c134ce4be552a54e4d0971fec566 (patch) | |
tree | 36d0509d914b47d911058d7d7ad5ab00de5f4a93 /internal/rubyserver | |
parent | 0ebda59da1bc8285645499a24268a54f2170b7d0 (diff) |
Make catfile cache size configurable
Diffstat (limited to 'internal/rubyserver')
-rw-r--r-- | internal/rubyserver/concurrency_test.go | 2 | ||||
-rw-r--r-- | internal/rubyserver/health_test.go | 2 | ||||
-rw-r--r-- | internal/rubyserver/testhelper_test.go | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/internal/rubyserver/concurrency_test.go b/internal/rubyserver/concurrency_test.go index e82311513..979c5e3d0 100644 --- a/internal/rubyserver/concurrency_test.go +++ b/internal/rubyserver/concurrency_test.go @@ -8,7 +8,6 @@ import ( "time" "gitlab.com/gitlab-org/gitaly/internal/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" "google.golang.org/grpc/codes" healthpb "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/status" @@ -28,7 +27,6 @@ func waitPing(s *Server) error { // This benchmark lets you see what happens when you throw a lot of // concurrent traffic at gitaly-ruby. func BenchmarkConcurrency(b *testing.B) { - testhelper.ConfigureRuby() config.Config.Ruby.NumWorkers = 2 s, err := Start() diff --git a/internal/rubyserver/health_test.go b/internal/rubyserver/health_test.go index 5d513b85d..f514d59f8 100644 --- a/internal/rubyserver/health_test.go +++ b/internal/rubyserver/health_test.go @@ -5,11 +5,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" ) func TestPingSuccess(t *testing.T) { - testhelper.ConfigureRuby() s, err := Start() require.NoError(t, err) defer s.Stop() diff --git a/internal/rubyserver/testhelper_test.go b/internal/rubyserver/testhelper_test.go index cc83a7923..2f3b2886a 100644 --- a/internal/rubyserver/testhelper_test.go +++ b/internal/rubyserver/testhelper_test.go @@ -4,11 +4,12 @@ import ( "os" "testing" + "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/internal/testhelper" ) var ( - testRepo = testhelper.TestRepository() + testRepo *gitalypb.Repository ) func TestMain(m *testing.M) { @@ -18,5 +19,7 @@ func TestMain(m *testing.M) { func testMain(m *testing.M) int { defer testhelper.MustHaveNoChildProcess() + testRepo = testhelper.TestRepository() + return m.Run() } |