diff options
| author | Valery Piashchynski <[email protected]> | 2021-06-26 14:08:33 +0300 |
|---|---|---|
| committer | Valery Piashchynski <[email protected]> | 2021-06-26 14:08:33 +0300 |
| commit | 53e50a05bd27ecec03695b69defd920fc4a25c5c (patch) | |
| tree | e86ca391e5a85118098c6340a0f0ae86747db042 /tests/plugins/http | |
| parent | ad1ca84b26bb6a4ba410a8a684fe3d2e2f86eaea (diff) | |
| parent | fc540f6029772ff51913b8ee3c082f8197010c52 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/jobs_plugin
Diffstat (limited to 'tests/plugins/http')
| -rw-r--r-- | tests/plugins/http/configs/.rr-http-supervised-pool.yaml | 8 | ||||
| -rw-r--r-- | tests/plugins/http/http_plugin_test.go | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/plugins/http/configs/.rr-http-supervised-pool.yaml b/tests/plugins/http/configs/.rr-http-supervised-pool.yaml index e0c38c12..8d4d81d9 100644 --- a/tests/plugins/http/configs/.rr-http-supervised-pool.yaml +++ b/tests/plugins/http/configs/.rr-http-supervised-pool.yaml @@ -2,17 +2,13 @@ rpc: listen: tcp://127.0.0.1:15432 server: command: "php ../../http/client.php echo pipes" - user: "" - group: "" - env: - "RR_HTTP": "true" relay: "pipes" relay_timeout: "20s" http: address: 127.0.0.1:18888 max_request_size: 1024 - middleware: [ "" ] + middleware: [] uploads: forbid: [ ".php", ".exe", ".bat" ] 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" ] @@ -29,4 +25,4 @@ http: max_worker_memory: 100 logs: mode: development - level: error
\ No newline at end of file + level: error diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go index fcedb943..c3949911 100644 --- a/tests/plugins/http/http_plugin_test.go +++ b/tests/plugins/http/http_plugin_test.go @@ -1481,6 +1481,8 @@ func informerTestAfter(t *testing.T) { assert.NotZero(t, workerPid) + time.Sleep(time.Second * 5) + err = client.Call("informer.Workers", "http", &list) assert.NoError(t, err) assert.Len(t, list.Workers, 1) |