restructure test

function_test.go

@@ -15,8 +15,8 @@ func TestFunction(t *testing.T) {
 
 	// create service
 	fn := NewFunction(
-		Name("test.function"),
 		Registry(mock.NewRegistry()),
+		Name("test.function"),
 		AfterStart(func() error {
 			wg.Done()
 			return nil
@@ -26,7 +26,13 @@ func TestFunction(t *testing.T) {
 	// we can't test fn.Init as it parses the command line
 	// fn.Init()
 
+	ch := make(chan error, 2)
+
 	go func() {
+		// run service
+		ch <- fn.Run()
+	}()
+
 	// wait for start
 	wg.Wait()
 
@@ -47,10 +53,8 @@ func TestFunction(t *testing.T) {
 	if rsp.Status != "ok" {
 		t.Fatalf("function response: %s", rsp.Status)
 	}
-	}()
 
-	// run service
-	if err := fn.Run(); err != nil {
+	if err := <-ch; err != nil {
 		t.Fatal(err)
 	}
 }