3 files changed, 17 insertions, 22 deletions
diff --git a/plugins/factory/tests/factory_test.go b/plugins/factory/tests/factory_test.go
index 5347083a..6c264fd6 100755
--- a/plugins/factory/tests/factory_test.go
+++ b/plugins/factory/tests/factory_test.go
@@ -31,11 +31,6 @@ func TestFactory(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = container.Register(&factory.WFactory{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	err = container.Register(&Foo{})
 	if err != nil {
 		t.Fatal(err)
@@ -65,7 +60,7 @@ func TestFactory(t *testing.T) {
 	for {
 		select {
 		case e := <-errCh:
-			assert.NoError(t, e.Error.Err)
+			assert.NoError(t, e.Error)
 			assert.NoError(t, container.Stop())
 			return
 		case <-c:
diff --git a/plugins/factory/tests/plugin_1.go b/plugins/factory/tests/plugin_1.go
index 5ab6df73..9011bb00 100755
--- a/plugins/factory/tests/plugin_1.go
+++ b/plugins/factory/tests/plugin_1.go
@@ -10,10 +10,10 @@ import (
 
 type Foo struct {
 	configProvider config.Provider
-	spawner        factory.Spawner
+	spawner        factory.AppFactory
 }
 
-func (f *Foo) Init(p config.Provider, spw factory.Spawner) error {
+func (f *Foo) Init(p config.Provider, spw factory.AppFactory) error {
 	f.configProvider = p
 	f.spawner = spw
 	return nil
@@ -22,14 +22,14 @@ func (f *Foo) Init(p config.Provider, spw factory.Spawner) error {
 func (f *Foo) Serve() chan error {
 	errCh := make(chan error, 1)
 
-	r := &factory.AppConfig{}
+	r := &factory.Config{}
 	err := f.configProvider.UnmarshalKey("app", r)
 	if err != nil {
 		errCh <- err
 		return errCh
 	}
 
-	cmd, err := f.spawner.NewCmd(nil)
+	cmd, err := f.spawner.NewCmdFactory(nil)
 	if err != nil {
 		errCh <- err
 		return errCh
diff --git a/plugins/factory/tests/plugin_2.go b/plugins/factory/tests/plugin_2.go
index 2409627e..9f401bec 100755
--- a/plugins/factory/tests/plugin_2.go
+++ b/plugins/factory/tests/plugin_2.go
@@ -13,28 +13,26 @@ import (
 
 type Foo2 struct {
 	configProvider config.Provider
-	wf             factory.WorkerFactory
-	spw            factory.Spawner
+	wf             factory.AppFactory
 }
 
-func (f *Foo2) Init(p config.Provider, workerFactory factory.WorkerFactory, spawner factory.Spawner) error {
+func (f *Foo2) Init(p config.Provider, workerFactory factory.AppFactory) error {
 	f.configProvider = p
 	f.wf = workerFactory
-	f.spw = spawner
 	return nil
 }
 
 func (f *Foo2) Serve() chan error {
 	errCh := make(chan error, 1)
 
-	r := &factory.AppConfig{}
+	r := &factory.Config{}
 	err := f.configProvider.UnmarshalKey("app", r)
 	if err != nil {
 		errCh <- err
 		return errCh
 	}
 
-	cmd, err := f.spw.NewCmd(nil)
+	cmd, err := f.wf.NewCmdFactory(nil)
 	if err != nil {
 		errCh <- err
 		return errCh
@@ -58,16 +56,18 @@ func (f *Foo2) Serve() chan error {
 
 	_ = w
 
-	poolConfig := &roadrunner.Config{
+	poolConfig := roadrunner.Config{
 		NumWorkers:      10,
 		MaxJobs:         100,
 		AllocateTimeout: time.Second * 10,
 		DestroyTimeout:  time.Second * 10,
-		TTL:             1000,
-		IdleTTL:         1000,
-		ExecTTL:         time.Second * 10,
-		MaxPoolMemory:   10000,
-		MaxWorkerMemory: 10000,
+		Supervisor: roadrunner.SupervisorConfig{
+			WatchTick:       60,
+			TTL:             1000,
+			IdleTTL:         10,
+			ExecTTL:         time.Second * 10,
+			MaxWorkerMemory: 1000,
+		},
 	}
 
 	pool, err := f.wf.NewWorkerPool(context.Background(), poolConfig, nil)