From 7fc4b37dfb06fc440bb0b9e56be32c0e93eb9535 Mon Sep 17 00:00:00 2001 From: Fenny <25108519+Fenny@users.noreply.github.com> Date: Wed, 15 Jul 2020 15:10:59 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20prefork=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ctx_test.go | 1 - prefork.go | 8 ++++++-- prefork_test.go | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ctx_test.go b/ctx_test.go index 5027ac54..2bd4d896 100644 --- a/ctx_test.go +++ b/ctx_test.go @@ -1423,7 +1423,6 @@ func (t *testTemplateEngine) Load() error { // go test -run Test_Ctx_Render_Engine func Test_Ctx_Render_Engine(t *testing.T) { - t.Parallel() engine := &testTemplateEngine{} engine.Load() app := New() diff --git a/prefork.go b/prefork.go index 49da3f7b..33a56aff 100644 --- a/prefork.go +++ b/prefork.go @@ -21,7 +21,7 @@ const ( var ( testPreforkMaster = false - dummyChildCmd = "date" + dummyChildCmd = "go version" ) // IsChild determines if the current process is a result of Prefork @@ -89,7 +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 - cmd = exec.Command(dummyChildCmd) + if runtime.GOOS == "windows" { + cmd = exec.Command("cmd", "/C", dummyChildCmd) + } else { + cmd = exec.Command(dummyChildCmd) + } } cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr diff --git a/prefork_test.go b/prefork_test.go index f640c220..2e850dfa 100644 --- a/prefork_test.go +++ b/prefork_test.go @@ -13,6 +13,7 @@ func Test_App_Prefork_Child_Process(t *testing.T) { defer os.Setenv(envPreforkChildKey, "") app := New() + app.Settings.DisableStartupMessage = true app.init() err := app.prefork("invalid") @@ -30,6 +31,7 @@ func Test_App_Prefork_Main_Process(t *testing.T) { testPreforkMaster = true app := New() + app.Settings.DisableStartupMessage = true app.init() go func() {