From 3394e37405e44be3c260fcd9c4fa344e347c5813 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 14 Jan 2021 10:32:51 -0800 Subject: [PATCH] libct/cg/sd/TestRangeToBits: be less verbose As we run unit tests with -v, this case produces lots of output which was handy while working on the code, but now it's more like noise: === RUN TestRangeToBits cpuset_test.go:43: case: "" cpuset_test.go:46: got error: empty value cpuset_test.go:43: case: "0" cpuset_test.go:53: expected [1], got [1] cpuset_test.go:43: case: "1" cpuset_test.go:53: expected [2], got [2] cpuset_test.go:43: case: "0-1" cpuset_test.go:53: expected [3], got [3] cpuset_test.go:43: case: "0,1" cpuset_test.go:53: expected [3], got [3] cpuset_test.go:43: case: ",0,1," cpuset_test.go:53: expected [3], got [3] cpuset_test.go:43: case: "0-3" cpuset_test.go:53: expected [15], got [15] cpuset_test.go:43: case: "0,1,2-3" cpuset_test.go:53: expected [15], got [15] cpuset_test.go:43: case: "4-7" cpuset_test.go:53: expected [240], got [240] cpuset_test.go:43: case: "0-7" cpuset_test.go:53: expected [255], got [255] cpuset_test.go:43: case: "0-15" cpuset_test.go:53: expected [255 255], got [255 255] cpuset_test.go:43: case: "16" cpuset_test.go:53: expected [1 0 0], got [1 0 0] cpuset_test.go:43: case: "0-3,32-33" cpuset_test.go:53: expected [3 0 0 0 15], got [3 0 0 0 15] cpuset_test.go:43: case: "1, 2, 1-2" cpuset_test.go:53: expected [6], got [6] cpuset_test.go:43: case: " , 1 , 3 , 5-7,\t" cpuset_test.go:53: expected [234], got [234] cpuset_test.go:43: case: "128-130,1" cpuset_test.go:53: expected [7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2], got [7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2] cpuset_test.go:43: case: "-" cpuset_test.go:46: got error: strconv.ParseUint: parsing "": invalid syntax cpuset_test.go:43: case: "1-" cpuset_test.go:46: got error: strconv.ParseUint: parsing "": invalid syntax cpuset_test.go:43: case: "-3" cpuset_test.go:46: got error: strconv.ParseUint: parsing "": invalid syntax cpuset_test.go:43: case: "54-53" cpuset_test.go:46: got error: invalid range: 54-53 cpuset_test.go:43: case: "1 - 2" cpuset_test.go:46: got error: strconv.ParseUint: parsing "1 ": invalid syntax --- PASS: TestRangeToBits (0.00s) Only log errors. Signed-off-by: Kir Kolyshkin --- libcontainer/cgroups/systemd/cpuset_test.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libcontainer/cgroups/systemd/cpuset_test.go b/libcontainer/cgroups/systemd/cpuset_test.go index 6f8fde073..7dda1e3c0 100644 --- a/libcontainer/cgroups/systemd/cpuset_test.go +++ b/libcontainer/cgroups/systemd/cpuset_test.go @@ -40,19 +40,16 @@ func TestRangeToBits(t *testing.T) { } for _, tc := range testCases { - t.Logf("case: %q", tc.in) out, err := rangeToBits(tc.in) if err != nil { - t.Logf(" got error: %s", err) if !tc.isErr { - t.Error(" ^^^ unexpected error") + t.Errorf("case %q: unexpected error: %v", tc.in, err) } continue } - t.Logf(" expected %v, got %v", tc.out, out) if !bytes.Equal(out, tc.out) { - t.Error(" ^^^ unexpected result") + t.Errorf("case %q: expected %v, got %v", tc.in, tc.out, out) } } }