diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2020-08-06 09:39:56 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2020-08-06 09:39:56 +0300 |
| commit | a1731804961b8a57610cb9251c0938b384cbaaf0 (patch) | |
| tree | 4d2a1de5bf09e149c9f1242b1b7178803b4e2a43 /internal/rubyserver | |
| parent | 0f3b4b0b121f611fac2a613ec0273864d5f38c8b (diff) | |
Feature flags enabling for tests.
It is decided to go with all features enabled by default behaviour
for tests. This should help us identify potential problems with
feature flag combinations enabled in production. To verify implementation
without feature flag enabled it should be disabled explicitly in the
test.
Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/2702
Diffstat (limited to 'internal/rubyserver')
| -rw-r--r-- | internal/rubyserver/concurrency_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/rubyserver/concurrency_test.go b/internal/rubyserver/concurrency_test.go index f9b50896d..37310c25f 100644 --- a/internal/rubyserver/concurrency_test.go +++ b/internal/rubyserver/concurrency_test.go @@ -1,7 +1,6 @@ package rubyserver import ( - "context" "fmt" "sync" "testing" @@ -9,6 +8,7 @@ import ( "github.com/stretchr/testify/require" "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" @@ -84,7 +84,7 @@ func BenchmarkConcurrency(b *testing.B) { } func makeRequest(s *Server) error { - ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) + ctx, cancel := testhelper.Context(testhelper.ContextWithTimeout(time.Second)) defer cancel() conn, err := s.getConnection(ctx) |