- Make http.Serve() async

Signed-off-by: Valery Piashchynski <[email protected]>

2 files changed, 37 insertions, 3 deletions

diff --git a/tests/plugins/gzip/plugin_test.go b/tests/plugins/gzip/plugin_test.go
index 9a9c760b..844fd411 100644
--- a/tests/plugins/gzip/plugin_test.go
+++ b/tests/plugins/gzip/plugin_test.go
@@ -81,6 +81,7 @@ func TestGzipPlugin(t *testing.T) {
 		}
 	}()
 
+	time.Sleep(time.Second * 2)
 	t.Run("GzipCheckHeader", headerCheck)
 
 	stopCh <- struct{}{}
diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go
index 73d6d102..4a491990 100644
--- a/tests/plugins/http/http_plugin_test.go
+++ b/tests/plugins/http/http_plugin_test.go
@@ -1227,10 +1227,43 @@ func TestHttpBrokenPipes(t *testing.T) {
 	err = cont.Init()
 	assert.NoError(t, err)
 
-	_, err = cont.Serve()
-	assert.Error(t, err)
+	ch, err := cont.Serve()
+	assert.NoError(t, err)
+
+	sig := make(chan os.Signal, 1)
+	signal.Notify(sig, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
+
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
+
+	stopCh := make(chan struct{}, 1)
+
+	go func() {
+		defer wg.Done()
+		for {
+			select {
+			// should be error from the plugin
+			case e := <-ch:
+				assert.Error(t, e.Error)
+				return
+			case <-sig:
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+				return
+			case <-stopCh:
+				// timeout
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+				return
+			}
+		}
+	}()
 
-	assert.NoError(t, cont.Stop())
+	wg.Wait()
 }
 
 func TestHTTPSupervisedPool(t *testing.T) {