From b55d452e46e81369a65978459a0683efa484c11b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 28 Mar 2026 12:44:20 +0100 Subject: [PATCH] testing: Simplify line ending handling in tests --- main_test.go | 12 ------------ testscripts/.gitattributes | 1 + testscripts/commands/mod.txt | 3 --- testscripts/commands/mod_init.txt | 1 - testscripts/commands/mod_npm.txt | 8 -------- testscripts/commands/mod_npm__moduleorder.txt | 4 ---- testscripts/commands/mod_npm_withexisting.txt | 3 --- testscripts/commands/mod_tidy.txt | 2 -- testscripts/commands/mod_vendor.txt | 2 -- testscripts/commands/mod_vendor__versions.txt | 2 -- 10 files changed, 1 insertion(+), 37 deletions(-) create mode 100644 testscripts/.gitattributes diff --git a/main_test.go b/main_test.go index 31a0a9683..36a28debc 100644 --- a/main_test.go +++ b/main_test.go @@ -87,18 +87,6 @@ var commonTestScriptsParam = testscript.Params{ "log": func(ts *testscript.TestScript, neg bool, args []string) { log.Println(args) }, - // dostounix converts \r\n to \n. - "dostounix": func(ts *testscript.TestScript, neg bool, args []string) { - filename := ts.MkAbs(args[0]) - b, err := os.ReadFile(filename) - if err != nil { - ts.Fatalf("%v", err) - } - b = bytes.Replace(b, []byte("\r\n"), []byte{'\n'}, -1) - if err := os.WriteFile(filename, b, 0o666); err != nil { - ts.Fatalf("%v", err) - } - }, // cat prints a file to stdout. "cat": func(ts *testscript.TestScript, neg bool, args []string) { filename := ts.MkAbs(args[0]) diff --git a/testscripts/.gitattributes b/testscripts/.gitattributes new file mode 100644 index 000000000..6313b56c5 --- /dev/null +++ b/testscripts/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/testscripts/commands/mod.txt b/testscripts/commands/mod.txt index 8500336cc..ee0a9adec 100644 --- a/testscripts/commands/mod.txt +++ b/testscripts/commands/mod.txt @@ -1,8 +1,5 @@ # Test the hugo mod commands. -dostounix golden/vendor.txt -dostounix golden/go.mod.testsubmod - hugo mod graph stdout 'empty-hugo' hugo mod verify diff --git a/testscripts/commands/mod_init.txt b/testscripts/commands/mod_init.txt index 55df0924f..64f775a58 100644 --- a/testscripts/commands/mod_init.txt +++ b/testscripts/commands/mod_init.txt @@ -1,5 +1,4 @@ # Test the hugo init command. -dostounix golden/go.mod.testsubmod hugo mod init testsubmod cmpenv go.mod $WORK/golden/go.mod.testsubmod diff --git a/testscripts/commands/mod_npm.txt b/testscripts/commands/mod_npm.txt index 44bd8c25a..169f26c17 100644 --- a/testscripts/commands/mod_npm.txt +++ b/testscripts/commands/mod_npm.txt @@ -1,13 +1,5 @@ # Test mod npm pack. -dostounix golden1/package.json -dostounix golden1/packages/hugoautogen/package.json -dostounix golden1/packages/hugoautogen/hugo_packagemeta.json -dostounix golden2/packages/hugoautogen/package.json -dostounix golden3/packages/hugoautogen/package.json -dostounix golden4/packages/hugoautogen/package.json -dostounix golden5/packages/hugoautogen/package.json - hugo mod npm pack cmp packages/hugoautogen/package.json golden1/packages/hugoautogen/package.json cmp package.json golden1/package.json diff --git a/testscripts/commands/mod_npm__moduleorder.txt b/testscripts/commands/mod_npm__moduleorder.txt index 0b9e783eb..1d4580c4d 100644 --- a/testscripts/commands/mod_npm__moduleorder.txt +++ b/testscripts/commands/mod_npm__moduleorder.txt @@ -1,9 +1,5 @@ # Test mod npm pack with shuffled modules. -dostounix golden1/package.json -dostounix golden1/packages/hugoautogen/package.json -dostounix golden1/packages/hugoautogen/hugo_packagemeta.json - hugo mod npm pack cmp packages/hugoautogen/package.json golden1/packages/hugoautogen/package.json cmp package.json golden1/package.json diff --git a/testscripts/commands/mod_npm_withexisting.txt b/testscripts/commands/mod_npm_withexisting.txt index 33382475c..b11a4a3b6 100644 --- a/testscripts/commands/mod_npm_withexisting.txt +++ b/testscripts/commands/mod_npm_withexisting.txt @@ -3,9 +3,6 @@ # See https://github.com/gohugoio/hugo/issues/13465 [windows] skip -dostounix golden/packages/hugoautogen/package.json -dostounix golden/package.json - hugo mod npm pack cmp packages/hugoautogen/package.json golden/packages/hugoautogen/package.json cmp package.json golden/package.json diff --git a/testscripts/commands/mod_tidy.txt b/testscripts/commands/mod_tidy.txt index 6e8d37f64..1a250f370 100644 --- a/testscripts/commands/mod_tidy.txt +++ b/testscripts/commands/mod_tidy.txt @@ -1,7 +1,5 @@ # Test hugo mod tidy. -dostounix golden/go.mod.cleaned - hugo mod tidy cmp go.mod golden/go.mod.cleaned diff --git a/testscripts/commands/mod_vendor.txt b/testscripts/commands/mod_vendor.txt index 20862c14e..53bb895fb 100644 --- a/testscripts/commands/mod_vendor.txt +++ b/testscripts/commands/mod_vendor.txt @@ -1,5 +1,3 @@ -dostounix golden/vendor.txt - hugo mod vendor cmp _vendor/modules.txt golden/vendor.txt ls _vendor/github.com/gohugoio/hugo-mod-integrationtests/withconfigtoml diff --git a/testscripts/commands/mod_vendor__versions.txt b/testscripts/commands/mod_vendor__versions.txt index 10a8a0367..49070b93b 100644 --- a/testscripts/commands/mod_vendor__versions.txt +++ b/testscripts/commands/mod_vendor__versions.txt @@ -1,5 +1,3 @@ -dostounix golden/vendor.txt - hugo mod vendor cmp _vendor/modules.txt golden/vendor.txt lsr _vendor -- 2.39.5