X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/37f07a3f9f202f66a88eb70dcd0002713889a9b0..a798952d64584cdcec2a13dc0df434692d2b521e:/lib/crunchstat/crunchstat_test.go

diff --git a/lib/crunchstat/crunchstat_test.go b/lib/crunchstat/crunchstat_test.go
index 864a3e3456..c27e39241d 100644
--- a/lib/crunchstat/crunchstat_test.go
+++ b/lib/crunchstat/crunchstat_test.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package crunchstat
 
 import (
@@ -19,10 +23,12 @@ func TestReadAllOrWarnFail(t *testing.T) {
 	logger, rcv := bufLogger()
 	rep := Reporter{Logger: logger}
 
+	done := make(chan bool)
 	var msg []byte
 	var err error
 	go func() {
 		msg, err = rcv.ReadBytes('\n')
+		close(done)
 	}()
 	{
 		// The special file /proc/self/mem can be opened for
@@ -35,9 +41,10 @@ func TestReadAllOrWarnFail(t *testing.T) {
 			t.Fatalf("Expected error, got %v", x)
 		}
 	}
+	<-done
 	if err != nil {
 		t.Fatal(err)
-	} else if matched, err := regexp.MatchString("^read /proc/self/mem: .*", string(msg)); err != nil || !matched {
+	} else if matched, err := regexp.MatchString("^warning: read /proc/self/mem: .*", string(msg)); err != nil || !matched {
 		t.Fatalf("Expected error message about unreadable file, got \"%s\"", msg)
 	}
 }
@@ -53,7 +60,7 @@ func TestReadAllOrWarnSuccess(t *testing.T) {
 	if err != nil {
 		t.Fatalf("got error %s", err)
 	}
-	if matched, err := regexp.MatchString("^package crunchstat\n", string(data)); err != nil || !matched {
+	if matched, err := regexp.MatchString("\npackage crunchstat\n", string(data)); err != nil || !matched {
 		t.Fatalf("data failed regexp: err %v, matched %v", err, matched)
 	}
 }