diff options
| author | Valery Piashchynski <[email protected]> | 2021-04-04 21:02:15 +0300 |
|---|---|---|
| committer | Valery Piashchynski <[email protected]> | 2021-04-04 21:02:15 +0300 |
| commit | 5efb7849b468a7564d48bcf70653b780520905b7 (patch) | |
| tree | 77d9a6fa865d73bb7d794959704753258312341d /tests/plugins/http/http_plugin_test.go | |
| parent | cc56299b877f3fbbae1e3368d98804d06564a424 (diff) | |
| parent | 899936387791bc4c73da5374484c3609b51981a2 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/readiness_probe_healthcheck_endpoint
# Conflicts:
# go.sum
Diffstat (limited to 'tests/plugins/http/http_plugin_test.go')
| -rw-r--r-- | tests/plugins/http/http_plugin_test.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go index cf22a9cd..51c5fda2 100644 --- a/tests/plugins/http/http_plugin_test.go +++ b/tests/plugins/http/http_plugin_test.go @@ -1003,21 +1003,22 @@ server: env: "RR_HTTP": "true" relay: "pipes" - relayTimeout: "20s" + relay_timeout: "20s" http: debug: true address: 127.0.0.1:34999 - maxRequestSize: 1024 + max_request_size: 1024 middleware: [ "pluginMiddleware", "pluginMiddleware2" ] uploads: forbid: [ "" ] - trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ] + trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ] pool: - numWorkers: 2 - maxJobs: 0 - allocateTimeout: 60s - destroyTimeout: 60s + num_workers: 2 + max_jobs: 0 + allocate_timeout: 60s + destroy_timeout: 60s + logs: mode: development level: error @@ -1037,7 +1038,7 @@ logs: mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).MinTimes(1) mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).MinTimes(1) mockLogger.EXPECT().Debug("201 GET http://localhost:34999/?hello=world", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1) - mockLogger.EXPECT().Debug("WORLD", "pid", gomock.Any()).MinTimes(1) + mockLogger.EXPECT().Info("WORLD").MinTimes(1) mockLogger.EXPECT().Debug("worker event received", "event", events.EventWorkerLog, "worker state", gomock.Any()).MinTimes(1) mockLogger.EXPECT().Error(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() // placeholder for the workerlogerror |