App test

6 files changed, 104 insertions, 152 deletions

diff --git a/plugins/app/tests/.rr.yaml b/plugins/app/tests/.rr.yaml
index c9d1bd40..171f51dc 100644
--- a/plugins/app/tests/.rr.yaml
+++ b/plugins/app/tests/.rr.yaml
@@ -1,5 +1,5 @@
 app:
-  command: "php plugins/app/tests/hello.php hello_echo"
+  command: "php hello.php"
   user: ""
   group: ""
   env:
diff --git a/plugins/app/tests/factory_test.go b/plugins/app/tests/factory_test.go
index 969c361c..878050a8 100644
--- a/plugins/app/tests/factory_test.go
+++ b/plugins/app/tests/factory_test.go
@@ -20,7 +20,7 @@ func TestFactory(t *testing.T) {
 	}
 	// config plugin
 	vp := &config.Viper{}
-	vp.Path = "plugins/app/tests/.rr.yaml"
+	vp.Path = ".rr.yaml"
 	vp.Prefix = "rr"
 	err = container.Register(vp)
 	if err != nil {
@@ -37,11 +37,6 @@ func TestFactory(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = container.Register(&Foo2{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	err = container.Register(&logger.ZapLogger{})
 	if err != nil {
 		t.Fatal(err)
@@ -61,7 +56,8 @@ func TestFactory(t *testing.T) {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 
-	tt := time.NewTicker(time.Second * 200)
+	// stop after 10 seconds
+	tt := time.NewTicker(time.Second * 10)
 
 	for {
 		select {
diff --git a/plugins/app/tests/hello.php b/plugins/app/tests/hello.php
index 4219dcf4..2591b77f 100644
--- a/plugins/app/tests/hello.php
+++ b/plugins/app/tests/hello.php
@@ -6,8 +6,9 @@
 use Spiral\Goridge;
 use Spiral\RoadRunner;
 
-require "/vendor_php/autoload.php";
+require dirname(__DIR__) . "/../../vendor_php/autoload.php";
 
+$relay = new Goridge\StreamRelay(STDIN, STDOUT);
 $rr = new RoadRunner\Worker($relay);
 
 while ($in = $rr->receive($ctx)) {
diff --git a/plugins/app/tests/plugin.go b/plugins/app/tests/plugin.go
new file mode 100644
index 00000000..e37aca01
--- /dev/null
+++ b/plugins/app/tests/plugin.go
@@ -0,0 +1,98 @@
+package tests
+
+import (
+	"context"
+	"time"
+
+	"github.com/spiral/errors"
+	"github.com/spiral/roadrunner/v2"
+	"github.com/spiral/roadrunner/v2/plugins/app"
+	"github.com/spiral/roadrunner/v2/plugins/config"
+)
+
+const ConfigSection = "app"
+
+var testPoolConfig = roadrunner.Config{
+	NumWorkers:      10,
+	MaxJobs:         100,
+	AllocateTimeout: time.Second * 10,
+	DestroyTimeout:  time.Second * 10,
+	Supervisor: &roadrunner.SupervisorConfig{
+		WatchTick:       60,
+		TTL:             1000,
+		IdleTTL:         10,
+		ExecTTL:         10,
+		MaxWorkerMemory: 1000,
+	},
+}
+
+type Foo struct {
+	configProvider config.Configurer
+	wf             app.WorkerFactory
+	pool           roadrunner.Pool
+}
+
+func (f *Foo) Init(p config.Configurer, workerFactory app.WorkerFactory) error {
+	f.configProvider = p
+	f.wf = workerFactory
+	return nil
+}
+
+func (f *Foo) Serve() chan error {
+	const op = errors.Op("serve")
+	errCh := make(chan error, 1)
+
+	conf := &app.Config{}
+	var err error
+	err = f.configProvider.UnmarshalKey(ConfigSection, conf)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	// test CMDFactory
+	cmd, err := f.wf.CmdFactory(nil)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+	if cmd == nil {
+		errCh <- errors.E(op, "command is nil")
+		return errCh
+	}
+
+	// test worker creation
+	_, err = f.wf.NewWorker(context.Background(), nil)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	f.pool, err = f.wf.NewWorkerPool(context.Background(), testPoolConfig, nil)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	r := roadrunner.Payload{
+		Context: nil,
+		Body:    []byte("test"),
+	}
+	rsp, err := f.pool.Exec(r)
+	if err != nil {
+		errCh <- err
+		return errCh
+	}
+
+	if string(rsp.Body) != "test" {
+		errCh <- errors.E("response from worker is wrong", errors.Errorf("response: %s", rsp.Body))
+		return errCh
+	}
+
+	return errCh
+}
+
+func (f *Foo) Stop() error {
+	f.pool.Destroy(context.Background())
+	return nil
+}
diff --git a/plugins/app/tests/plugin_1.go b/plugins/app/tests/plugin_1.go
deleted file mode 100644
index c6287f5c..00000000
--- a/plugins/app/tests/plugin_1.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package tests
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/spiral/roadrunner/v2/plugins/app"
-	"github.com/spiral/roadrunner/v2/plugins/config"
-)
-
-type Foo struct {
-	configProvider config.Configurer
-	spawner        app.WorkerFactory
-}
-
-func (f *Foo) Init(p config.Configurer, spw app.WorkerFactory) error {
-	f.configProvider = p
-	f.spawner = spw
-	return nil
-}
-
-func (f *Foo) Serve() chan error {
-	errCh := make(chan error, 1)
-
-	r := &app.Config{}
-	err := f.configProvider.UnmarshalKey("app", r)
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-
-	cmd, err := f.spawner.CmdFactory(nil)
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-	if cmd == nil {
-		errCh <- errors.New("command is nil")
-		return errCh
-	}
-	a := cmd()
-	out, err := a.Output()
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-
-	fmt.Println(string(out))
-
-	return errCh
-}
-
-func (f *Foo) Stop() error {
-	return nil
-}
diff --git a/plugins/app/tests/plugin_2.go b/plugins/app/tests/plugin_2.go
deleted file mode 100644
index 51fb83a4..00000000
--- a/plugins/app/tests/plugin_2.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package tests
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/spiral/roadrunner/v2"
-	"github.com/spiral/roadrunner/v2/plugins/app"
-	"github.com/spiral/roadrunner/v2/plugins/config"
-)
-
-type Foo2 struct {
-	configProvider config.Configurer
-	wf             app.WorkerFactory
-}
-
-func (f *Foo2) Init(p config.Configurer, workerFactory app.WorkerFactory) error {
-	f.configProvider = p
-	f.wf = workerFactory
-	return nil
-}
-
-func (f *Foo2) Serve() chan error {
-	errCh := make(chan error, 1)
-
-	r := &app.Config{}
-	err := f.configProvider.UnmarshalKey("app", r)
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-
-	cmd, err := f.wf.CmdFactory(nil)
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-	if cmd == nil {
-		errCh <- errors.New("command is nil")
-		return errCh
-	}
-	a := cmd()
-	out, err := a.Output()
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-
-	w, err := f.wf.NewWorker(context.Background(), nil)
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-
-	_ = w
-
-	poolConfig := roadrunner.Config{
-		NumWorkers:      10,
-		MaxJobs:         100,
-		AllocateTimeout: time.Second * 10,
-		DestroyTimeout:  time.Second * 10,
-		Supervisor: &roadrunner.SupervisorConfig{
-			WatchTick:       60,
-			TTL:             1000,
-			IdleTTL:         10,
-			ExecTTL:         10,
-			MaxWorkerMemory: 1000,
-		},
-	}
-
-	pool, err := f.wf.NewWorkerPool(context.Background(), poolConfig, nil)
-	if err != nil {
-		errCh <- err
-		return errCh
-	}
-
-	_ = pool
-
-	fmt.Println(string(out))
-
-	return errCh
-}
-
-func (f *Foo2) Stop() error {
-	return nil
-}