From 00c4228f61c839431957a6750f1fe1f0016aefec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 27 Jan 2026 16:53:27 +0100 Subject: [PATCH] testscripts: Move server tests to own folder See #14439 --- main_test.go | 15 +++++++++------ testscripts/{commands => server}/hugo__watch.txt | 0 testscripts/{commands => server}/server.txt | 0 .../{commands => server}/server__edit_config.txt | 0 .../{commands => server}/server__edit_content.txt | 0 .../server__edit_content_with_chinese_tag.txt | 0 .../server__error_recovery_edit_config.txt | 0 .../server__error_recovery_edit_content.txt | 0 .../{commands => server}/server__multihost.txt | 0 .../server__watch_hugo_stats.txt | 0 .../server__watch_moduleconfig.txt | 0 .../server_disablelivereload.txt | 0 .../server_disablelivereload__config.txt | 0 .../server_render_static_to_disk.txt | 0 .../server_render_to_memory.txt | 0 15 files changed, 9 insertions(+), 6 deletions(-) rename testscripts/{commands => server}/hugo__watch.txt (100%) rename testscripts/{commands => server}/server.txt (100%) rename testscripts/{commands => server}/server__edit_config.txt (100%) rename testscripts/{commands => server}/server__edit_content.txt (100%) rename testscripts/{commands => server}/server__edit_content_with_chinese_tag.txt (100%) rename testscripts/{commands => server}/server__error_recovery_edit_config.txt (100%) rename testscripts/{commands => server}/server__error_recovery_edit_content.txt (100%) rename testscripts/{commands => server}/server__multihost.txt (100%) rename testscripts/{commands => server}/server__watch_hugo_stats.txt (100%) rename testscripts/{commands => server}/server__watch_moduleconfig.txt (100%) rename testscripts/{commands => server}/server_disablelivereload.txt (100%) rename testscripts/{commands => server}/server_disablelivereload__config.txt (100%) rename testscripts/{commands => server}/server_render_static_to_disk.txt (100%) rename testscripts/{commands => server}/server_render_to_memory.txt (100%) diff --git a/main_test.go b/main_test.go index 34c86034b..79d0c554e 100644 --- a/main_test.go +++ b/main_test.go @@ -32,21 +32,24 @@ import ( "github.com/bep/helpers/envhelpers" "github.com/gohugoio/hugo/commands" + "github.com/gohugoio/hugo/htesting" "github.com/rogpeppe/go-internal/testscript" ) func TestCommands(t *testing.T) { - // These are somewhat flakey and takes some time, - // so usefule to have a way to skip them when developing. - const skipEnv = "HUGOTESTING_SKIP_COMMANDS" - if os.Getenv(skipEnv) != "" { - t.Skipf("skip because %s set in env", skipEnv) - } p := commonTestScriptsParam p.Dir = "testscripts/commands" testscript.Run(t, p) } +func TestServer(t *testing.T) { + // See issue #14439 + htesting.SkipSlowTestUnlessCI(t) + p := commonTestScriptsParam + p.Dir = "testscripts/server" + testscript.Run(t, p) +} + // Tests in development can be put in "testscripts/unfinished". // Also see the watch_testscripts.sh script. func TestUnfinished(t *testing.T) { diff --git a/testscripts/commands/hugo__watch.txt b/testscripts/server/hugo__watch.txt similarity index 100% rename from testscripts/commands/hugo__watch.txt rename to testscripts/server/hugo__watch.txt diff --git a/testscripts/commands/server.txt b/testscripts/server/server.txt similarity index 100% rename from testscripts/commands/server.txt rename to testscripts/server/server.txt diff --git a/testscripts/commands/server__edit_config.txt b/testscripts/server/server__edit_config.txt similarity index 100% rename from testscripts/commands/server__edit_config.txt rename to testscripts/server/server__edit_config.txt diff --git a/testscripts/commands/server__edit_content.txt b/testscripts/server/server__edit_content.txt similarity index 100% rename from testscripts/commands/server__edit_content.txt rename to testscripts/server/server__edit_content.txt diff --git a/testscripts/commands/server__edit_content_with_chinese_tag.txt b/testscripts/server/server__edit_content_with_chinese_tag.txt similarity index 100% rename from testscripts/commands/server__edit_content_with_chinese_tag.txt rename to testscripts/server/server__edit_content_with_chinese_tag.txt diff --git a/testscripts/commands/server__error_recovery_edit_config.txt b/testscripts/server/server__error_recovery_edit_config.txt similarity index 100% rename from testscripts/commands/server__error_recovery_edit_config.txt rename to testscripts/server/server__error_recovery_edit_config.txt diff --git a/testscripts/commands/server__error_recovery_edit_content.txt b/testscripts/server/server__error_recovery_edit_content.txt similarity index 100% rename from testscripts/commands/server__error_recovery_edit_content.txt rename to testscripts/server/server__error_recovery_edit_content.txt diff --git a/testscripts/commands/server__multihost.txt b/testscripts/server/server__multihost.txt similarity index 100% rename from testscripts/commands/server__multihost.txt rename to testscripts/server/server__multihost.txt diff --git a/testscripts/commands/server__watch_hugo_stats.txt b/testscripts/server/server__watch_hugo_stats.txt similarity index 100% rename from testscripts/commands/server__watch_hugo_stats.txt rename to testscripts/server/server__watch_hugo_stats.txt diff --git a/testscripts/commands/server__watch_moduleconfig.txt b/testscripts/server/server__watch_moduleconfig.txt similarity index 100% rename from testscripts/commands/server__watch_moduleconfig.txt rename to testscripts/server/server__watch_moduleconfig.txt diff --git a/testscripts/commands/server_disablelivereload.txt b/testscripts/server/server_disablelivereload.txt similarity index 100% rename from testscripts/commands/server_disablelivereload.txt rename to testscripts/server/server_disablelivereload.txt diff --git a/testscripts/commands/server_disablelivereload__config.txt b/testscripts/server/server_disablelivereload__config.txt similarity index 100% rename from testscripts/commands/server_disablelivereload__config.txt rename to testscripts/server/server_disablelivereload__config.txt diff --git a/testscripts/commands/server_render_static_to_disk.txt b/testscripts/server/server_render_static_to_disk.txt similarity index 100% rename from testscripts/commands/server_render_static_to_disk.txt rename to testscripts/server/server_render_static_to_disk.txt diff --git a/testscripts/commands/server_render_to_memory.txt b/testscripts/server/server_render_to_memory.txt similarity index 100% rename from testscripts/commands/server_render_to_memory.txt rename to testscripts/server/server_render_to_memory.txt -- 2.39.5