Skip to content

Commit 687464e

Browse files
committed
cmd/cue/cmd: use the new goproxytest.NewTestServer
Which avoids chatty tests logging directly to stderr: $ go test go proxy: no archive externalmod.test v1.0.0 go proxy: no archive externalmod.test/imports/root v1.0.0 go proxy: no archive externalmod.test v1.0.0 PASS ok cuelang.org/go/cmd/cue/cmd 3.314s Now these log lines are part of TestScript, and shown only with -v: $ go test -run TestScript/get_go_non_local -v [...] === NAME TestScript proxy.go:225: go proxy: no archive externalmod.test v1.0.0 proxy.go:225: go proxy: no archive externalmod.test v1.0.0 proxy.go:225: go proxy: no archive externalmod.test/imports/root v1.0.0 Signed-off-by: Daniel Martí <[email protected]> Change-Id: I073b9b284694900634f9bc315813c6579bafa03d Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1201550 Reviewed-by: Roger Peppe <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Unity-Result: CUE porcuepine <[email protected]>
1 parent 7352390 commit 687464e

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

cmd/cue/cmd/script_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,7 @@ func TestLatest(t *testing.T) {
9696
}
9797

9898
func TestScript(t *testing.T) {
99-
srv, err := goproxytest.NewServer(filepath.Join("testdata", "mod"), "")
100-
if err != nil {
101-
t.Fatalf("cannot start proxy: %v", err)
102-
}
103-
t.Cleanup(srv.Close)
99+
srv := goproxytest.NewTestServer(t, filepath.Join("testdata", "mod"), "")
104100
p := testscript.Params{
105101
Dir: filepath.Join("testdata", "script"),
106102
UpdateScripts: cuetest.UpdateGoldenFiles,

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/opencontainers/image-spec v1.1.0
1616
github.com/pelletier/go-toml/v2 v2.2.2
1717
github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0
18-
github.com/rogpeppe/go-internal v1.12.1-0.20240709150035-ccf4b4329d21
18+
github.com/rogpeppe/go-internal v1.12.1-0.20240920093810-3a65db189041
1919
github.com/spf13/cobra v1.8.1
2020
github.com/spf13/pflag v1.0.5
2121
github.com/tetratelabs/wazero v1.6.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
4141
github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 h1:sadMIsgmHpEOGbUs6VtHBXRR1OHevnj7hLx9ZcdNGW4=
4242
github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c=
4343
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
44-
github.com/rogpeppe/go-internal v1.12.1-0.20240709150035-ccf4b4329d21 h1:igWZJluD8KtEtAgRyF4x6lqcxDry1ULztksMJh2mnQE=
45-
github.com/rogpeppe/go-internal v1.12.1-0.20240709150035-ccf4b4329d21/go.mod h1:RMRJLmBOqWacUkmJHRMiPKh1S1m3PA7Zh4W80/kWPpg=
44+
github.com/rogpeppe/go-internal v1.12.1-0.20240920093810-3a65db189041 h1:aI+8qoYUwVfAADK+0/9qk9pTqNz8+pKa2OU47wBaUdU=
45+
github.com/rogpeppe/go-internal v1.12.1-0.20240920093810-3a65db189041/go.mod h1:RMRJLmBOqWacUkmJHRMiPKh1S1m3PA7Zh4W80/kWPpg=
4646
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
4747
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
4848
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=

0 commit comments

Comments
 (0)