From 0addb302ac87531a107b07991616b21c8b8e6a48 Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Tue, 4 Oct 2022 03:43:05 -0600 Subject: [PATCH] server: Fix flaky TestServerPathEncodingIssues tests Set getNumHomes: 1 to enable 567 ms or 2 s of wait for the server to be ready in TestServerPathEncodingIssues/Unicode_paths and TestServerPathEncodingIssues/Windows_multilingual_404. Fixes #10332 --- commands/server_test.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/commands/server_test.go b/commands/server_test.go index a02eb3c8bbc..7a39723733f 100644 --- a/commands/server_test.go +++ b/commands/server_test.go @@ -25,7 +25,6 @@ import ( "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/helpers" - "github.com/gohugoio/hugo/htesting" "golang.org/x/net/context" "golang.org/x/sync/errgroup" @@ -69,20 +68,14 @@ func TestServer404(t *testing.T) { } func TestServerPathEncodingIssues(t *testing.T) { - if htesting.IsGitHubAction() { - // This test is flaky on CI for some reason. Run it on Windows only for now. - // TODO(bep) - if runtime.GOOS != "windows" { - t.Skip("Skipping test on CI") - } - } c := qt.New(t) // Issue 10287 c.Run("Unicode paths", func(c *qt.C) { r := runServerTest(c, serverTestOptions{ - pathsToGet: []string{"hügö/"}, + pathsToGet: []string{"hügö/"}, + getNumHomes: 1, }, ) @@ -123,8 +116,9 @@ status = 404 ` r := runServerTest(c, serverTestOptions{ - config: config, - pathsToGet: []string{"en/this/does/not/exist", "es/this/does/not/exist"}, + config: config, + pathsToGet: []string{"en/this/does/not/exist", "es/this/does/not/exist"}, + getNumHomes: 1, }, )