Add test scripts for the pipes and sockets

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

6 files changed, 83 insertions, 5 deletions

diff --git a/tests/pipes_test_script.sh b/tests/pipes_test_script.sh
new file mode 100755
index 00000000..c759b0a6
--- /dev/null
+++ b/tests/pipes_test_script.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+php ../../tests/client.php echo pipes
diff --git a/tests/script.sh b/tests/script.sh
deleted file mode 100755
index 746fb768..00000000
--- a/tests/script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-php ../../../tests/client.php echo pipes
\ No newline at end of file
diff --git a/tests/socket_test_script.sh b/tests/socket_test_script.sh
new file mode 100755
index 00000000..3948c4fb
--- /dev/null
+++ b/tests/socket_test_script.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+php ../../tests/client.php echo tcp
diff --git a/transport/pipe/pipe_factory_test.go b/transport/pipe/pipe_factory_test.go
index f8198610..b4ba8c87 100755
--- a/transport/pipe/pipe_factory_test.go
+++ b/transport/pipe/pipe_factory_test.go
@@ -179,6 +179,33 @@ func Test_Pipe_Echo(t *testing.T) {
 	assert.Equal(t, "hello", res.String())
 }
 
+func Test_Pipe_Echo_Script(t *testing.T) {
+	t.Parallel()
+	cmd := exec.Command("sh", "../../tests/pipes_test_script.sh")
+	ctx := context.Background()
+	w, err := NewPipeFactory().SpawnWorkerWithTimeout(ctx, cmd)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		err = w.Stop()
+		if err != nil {
+			t.Errorf("error stopping the Process: error %v", err)
+		}
+	}()
+
+	sw := worker.From(w)
+
+	res, err := sw.Exec(&payload.Payload{Body: []byte("hello")})
+
+	assert.NoError(t, err)
+	assert.NotNil(t, res)
+	assert.NotNil(t, res.Body)
+	assert.Empty(t, res.Context)
+
+	assert.Equal(t, "hello", res.String())
+}
+
 func Test_Pipe_Broken(t *testing.T) {
 	t.Parallel()
 	cmd := exec.Command("php", "../../tests/client.php", "broken", "pipes")
diff --git a/transport/socket/socket_factory.go b/transport/socket/socket_factory.go
index e5b36cfa..39c04eac 100755
--- a/transport/socket/socket_factory.go
+++ b/transport/socket/socket_factory.go
@@ -223,11 +223,20 @@ func (f *Factory) findRelayWithContext(ctx context.Context, w worker.BaseProcess
 				return nil, err
 			}
 		default:
-			tmp, ok := f.relays.LoadAndDelete(w.Pid())
-			if !ok {
+			// find first pid and attach relay to it
+			var r *socket.Relay
+			f.relays.Range(func(k, val interface{}) bool {
+				r = val.(*socket.Relay)
+				f.relays.Delete(k)
+				return false
+			})
+
+			// no relay exists
+			if r == nil {
 				continue
 			}
-			return tmp.(*socket.Relay), nil
+
+			return r, nil
 		}
 	}
 }
diff --git a/transport/socket/socket_factory_test.go b/transport/socket/socket_factory_test.go
index 879dba8e..d517d026 100755
--- a/transport/socket/socket_factory_test.go
+++ b/transport/socket/socket_factory_test.go
@@ -282,6 +282,46 @@ func Test_Tcp_Echo(t *testing.T) {
 	assert.Equal(t, "hello", res.String())
 }
 
+func Test_Tcp_Echo_Script(t *testing.T) {
+	time.Sleep(time.Millisecond * 10) // to ensure free socket
+	ctx := context.Background()
+	ls, err := net.Listen("tcp", "127.0.0.1:9007")
+	if assert.NoError(t, err) {
+		defer func() {
+			err = ls.Close()
+			if err != nil {
+				t.Errorf("error closing the listener: error %v", err)
+			}
+		}()
+	} else {
+		t.Skip("socket is busy")
+	}
+
+	cmd := exec.Command("sh", "../../tests/socket_test_script.sh")
+
+	w, _ := NewSocketServer(ls, time.Minute).SpawnWorkerWithTimeout(ctx, cmd)
+	go func() {
+		assert.NoError(t, w.Wait())
+	}()
+	defer func() {
+		err = w.Stop()
+		if err != nil {
+			t.Errorf("error stopping the Process: error %v", err)
+		}
+	}()
+
+	sw := worker.From(w)
+
+	res, err := sw.Exec(&payload.Payload{Body: []byte("hello")})
+
+	assert.NoError(t, err)
+	assert.NotNil(t, res)
+	assert.NotNil(t, res.Body)
+	assert.Empty(t, res.Context)
+
+	assert.Equal(t, "hello", res.String())
+}
+
 func Test_Unix_Start(t *testing.T) {
 	ctx := context.Background()
 	ls, err := net.Listen("unix", "sock.unix")