diff options
Diffstat (limited to 'tests/plugins')
-rw-r--r-- | tests/plugins/gzip/configs/.rr-http-withGzip.yaml | 2 | ||||
-rw-r--r-- | tests/plugins/http/http_plugin_test.go | 4 | ||||
-rw-r--r-- | tests/plugins/informer/test_plugin.go | 8 | ||||
-rw-r--r-- | tests/plugins/server/server_plugin_test.go | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/tests/plugins/gzip/configs/.rr-http-withGzip.yaml b/tests/plugins/gzip/configs/.rr-http-withGzip.yaml index 3ab918fb..dc12dc05 100644 --- a/tests/plugins/gzip/configs/.rr-http-withGzip.yaml +++ b/tests/plugins/gzip/configs/.rr-http-withGzip.yaml @@ -2,8 +2,6 @@ server: command: "php ../../psr-worker.php" user: "" group: "" - env: - "RR_HTTP": "true" relay: "pipes" relay_timeout: "20s" diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go index 9cd1c147..0b6fb77a 100644 --- a/tests/plugins/http/http_plugin_test.go +++ b/tests/plugins/http/http_plugin_test.go @@ -1216,10 +1216,12 @@ func TestHttpBrokenPipes(t *testing.T) { assert.NoError(t, err) err = cont.Init() - assert.Error(t, err) + assert.NoError(t, err) _, err = cont.Serve() assert.Error(t, err) + + assert.NoError(t, cont.Stop()) } func TestHTTPSupervisedPool(t *testing.T) { diff --git a/tests/plugins/informer/test_plugin.go b/tests/plugins/informer/test_plugin.go index 2300de89..8a1fb933 100644 --- a/tests/plugins/informer/test_plugin.go +++ b/tests/plugins/informer/test_plugin.go @@ -55,11 +55,5 @@ func (p1 *Plugin1) Workers() []worker.BaseProcess { panic(err) } - workers := p.Workers() - baseWorkers := make([]worker.BaseProcess, 0, len(workers)) - for i := 0; i < len(workers); i++ { - baseWorkers = append(baseWorkers, worker.FromSync(workers[i].(*worker.SyncWorkerImpl))) - } - - return baseWorkers + return p.Workers() } diff --git a/tests/plugins/server/server_plugin_test.go b/tests/plugins/server/server_plugin_test.go index f600832a..c0c3c993 100644 --- a/tests/plugins/server/server_plugin_test.go +++ b/tests/plugins/server/server_plugin_test.go @@ -278,7 +278,7 @@ func TestAppWrongRelay(t *testing.T) { } err = container.Init() - assert.Error(t, err) + assert.NoError(t, err) _, err = container.Serve() assert.Error(t, err) |