Merge branch 'release_2.0' into feature/new-worker-produces-active-worker

2 files changed, 3 insertions, 8 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 f6b06dd0..df632481 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