Skip to content

Commit b4723f8

Browse files
committed
Process tests added
1 parent 1cc96e8 commit b4723f8

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

pkg/phpfpm/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ func NewProcess(
3030
cmd.Env = os.Environ()
3131
cmd.Env = append(cmd.Env, fmt.Sprintf("FPM_WRAPPER_SOCK=unix://%s", wrapperSocket))
3232

33+
cmd.Args = append(cmd.Args, extraArgs...)
3334
cmd.Args = append(cmd.Args, "--nodaemonize")
3435
cmd.Args = append(cmd.Args, "--fpm-config", fpmConfigPath)
35-
cmd.Args = append(cmd.Args, extraArgs...)
3636

3737
return &Process{cmd: cmd, shutdownDelay: shutdownDelay}
3838
}

pkg/phpfpm/process_test.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package phpfpm
2+
3+
import (
4+
"testing"
5+
"bytes"
6+
7+
"github.com/stretchr/testify/assert"
8+
)
9+
10+
func TestNewProcess(t *testing.T) {
11+
stdout := bytes.NewBufferString("")
12+
stderr := bytes.NewBufferString("")
13+
14+
p := NewProcess("echo", "configpath", stdout, stderr, "/tmp/sock", 0, "-n")
15+
assert.NoError(t, p.Start())
16+
17+
errCh := make(chan error, 1)
18+
code := p.Wait(errCh)
19+
20+
assert.Equal(t, 0, code)
21+
assert.Equal(t, "--nodaemonize --fpm-config configpath", stdout.String())
22+
assert.Equal(t, "", stderr.String())
23+
}

0 commit comments

Comments
 (0)