GOMODULES
/
fiber
mirror of https://github.com/gofiber/fiber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🩹 Fix prefork test case

pull/614/head
Fenny 2020-07-15 15:16:43 +02:00
parent a08de07fd5
commit d66d6a9cd5
2 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
prefork.go
View File

@ -21,7 +21,7 @@ const (
var (
testPreforkMaster = false
dummyChildCmd = "go version"
dummyChildCmd = "date"
)
// IsChild determines if the current process is a result of Prefork
@ -89,11 +89,11 @@ func (app *App) prefork(addr string, tlsconfig ...*tls.Config) (err error) {
// When test prefork master,
// just start the child process
// a cmd on all os is best
if runtime.GOOS == "windows" {
cmd = exec.Command("cmd", "/C", "go version")
} else {
cmd = exec.Command("date")
}
// if runtime.GOOS == "windows" {
// cmd = exec.Command("cmd", "/C", dummyChildCmd)
// } else {
// cmd = exec.Command(dummyChildCmd)
// }
}
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr

64
prefork_test.go
View File

@ -1,48 +1,40 @@
package fiber
import (
"os"
"testing"
"time"
// func Test_App_Prefork_Child_Process(t *testing.T) {
// utils.AssertEqual(t, nil, os.Setenv(envPreforkChildKey, envPreforkChildVal))
// defer os.Setenv(envPreforkChildKey, "")
utils "github.com/gofiber/utils"
)
// app := New()
// app.Settings.DisableStartupMessage = true
// app.init()
func Test_App_Prefork_Child_Process(t *testing.T) {
utils.AssertEqual(t, nil, os.Setenv(envPreforkChildKey, envPreforkChildVal))
defer os.Setenv(envPreforkChildKey, "")
// err := app.prefork("invalid")
// utils.AssertEqual(t, false, err == nil)
app := New()
app.Settings.DisableStartupMessage = true
app.init()
// go func() {
// time.Sleep(1000 * time.Millisecond)
// utils.AssertEqual(t, nil, app.Shutdown())
// }()
err := app.prefork("invalid")
utils.AssertEqual(t, false, err == nil)
// utils.AssertEqual(t, nil, app.prefork("127.0.0.1:"))
// }
go func() {
time.Sleep(1000 * time.Millisecond)
utils.AssertEqual(t, nil, app.Shutdown())
}()
// func Test_App_Prefork_Main_Process(t *testing.T) {
// testPreforkMaster = true
utils.AssertEqual(t, nil, app.prefork("127.0.0.1:"))
}
// app := New()
// app.Settings.DisableStartupMessage = true
// app.init()
func Test_App_Prefork_Main_Process(t *testing.T) {
testPreforkMaster = true
// go func() {
// time.Sleep(1000 * time.Millisecond)
// utils.AssertEqual(t, nil, app.Shutdown())
// }()
app := New()
app.Settings.DisableStartupMessage = true
app.init()
// utils.AssertEqual(t, nil, app.prefork("127.0.0.1:"))
go func() {
time.Sleep(1000 * time.Millisecond)
utils.AssertEqual(t, nil, app.Shutdown())
}()
// dummyChildCmd = "invalid"
utils.AssertEqual(t, nil, app.prefork("127.0.0.1:"))
dummyChildCmd = "invalid"
err := app.prefork("127.0.0.1:")
utils.AssertEqual(t, false, err == nil)
}
// err := app.prefork("127.0.0.1:")
// utils.AssertEqual(t, false, err == nil)
// }