diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-11-17 16:57:11 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-11-17 16:57:11 +0300 |
| commit | 61ce7e9b211bd850c8743c88ef59451843ad36bd (patch) | |
| tree | a76f4587fc28571fed8b8b8d88b7e54fa2414220 | |
| parent | 57ac403e3ac18dbfa7e1e72bfb3eb8ab01cea626 (diff) | |
| parent | ba9e4e7846361e9b83c0ac5a8039af69ee1fc506 (diff) | |
Merge branch 'pks-gitaly-server-factory-logging-race' into 'master'
gitaly/server: Fix race checking for expected log entries
Closes #3916
See merge request gitlab-org/gitaly!4086
| -rw-r--r-- | internal/gitaly/server/server_factory_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/internal/gitaly/server/server_factory_test.go b/internal/gitaly/server/server_factory_test.go index a9ad14696..682415550 100644 --- a/internal/gitaly/server/server_factory_test.go +++ b/internal/gitaly/server/server_factory_test.go @@ -135,6 +135,9 @@ func TestGitalyServerFactory(t *testing.T) { checkHealth(t, sf, starter.TCP, "localhost:0") + // Stop all servers to drain any postprocessing done for RPC calls. + sf.GracefulStop() + var entry *logrus.Entry for _, e := range hook.AllEntries() { if e.Message == "finished unary call with code OK" { |