From 062c9832a6cdb39bf38ad7a6dad51300a2e9a734 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Thu, 1 Oct 2020 13:16:00 +0200 Subject: vm/vmimpl/merger: remove all CRs from output Get rid of all places stripping \r in pkg/report. And adapt all tests. Signed-off-by: Alexander Egorenkov --- vm/vmimpl/merger_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vm/vmimpl/merger_test.go') diff --git a/vm/vmimpl/merger_test.go b/vm/vmimpl/merger_test.go index b8ae9dfc3..8308aff5e 100644 --- a/vm/vmimpl/merger_test.go +++ b/vm/vmimpl/merger_test.go @@ -44,13 +44,13 @@ func TestMerger(t *testing.T) { case <-time.After(10 * time.Millisecond): } - wp1.Write([]byte("333\n444")) + wp1.Write([]byte("333\n444\r")) got := string(<-merger.Output) if want := "111333\n"; got != want { t.Fatalf("bad line: '%s', want '%s'", got, want) } - wp2.Write([]byte("555\n666\n777")) + wp2.Write([]byte("555\r\n666\n\r\r777")) got = string(<-merger.Output) if want := "222555\n666\n"; got != want { t.Fatalf("bad line: '%s', want '%s'", got, want) -- cgit mrf-deployment