From 92d84efb1099b60bcbdc79e740be1d24ce37612b Mon Sep 17 00:00:00 2001 From: Rahat Mahmood Date: Wed, 27 Apr 2022 16:29:04 -0700 Subject: [PATCH] Ignore whitespace changes in seccheck test message. PiperOrigin-RevId: 444998438 --- pkg/sentry/seccheck/checkers/remote/remote_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/sentry/seccheck/checkers/remote/remote_test.go b/pkg/sentry/seccheck/checkers/remote/remote_test.go index bdcef353b..6091b3fd9 100644 --- a/pkg/sentry/seccheck/checkers/remote/remote_test.go +++ b/pkg/sentry/seccheck/checkers/remote/remote_test.go @@ -283,8 +283,11 @@ func TestExample(t *testing.T) { t.Fatalf("ExitNotifyParent: %v", err) } check := func() error { - if got := server.out.String(); !strings.Contains(got, "gvisor.sentry.ExitNotifyParentInfo => exit_status: 123") { - return fmt.Errorf("ExitNotifyParentInfo point didn't get to the server, out: %q", got) + gotRaw := server.out.String() + // Collapse whitespace. + got := strings.Join(strings.Fields(gotRaw), " ") + if !strings.Contains(got, "gvisor.sentry.ExitNotifyParentInfo => exit_status: 123") { + return fmt.Errorf("ExitNotifyParentInfo point didn't get to the server, out: %q, raw: %q", got, gotRaw) } return nil }