10218: Merge branch 'master' into 10218-record-node-info

[arvados.git] / lib / crunchstat / crunchstat_test.go

diff --git a/lib/crunchstat/crunchstat_test.go b/lib/crunchstat/crunchstat_test.go
index 864a3e3456e6afdba773158594e71f17b9808493..697f2352d503fef199ee4eeda2c28550a526d439 100644 (file)
--- a/lib/crunchstat/crunchstat_test.go
+++ b/lib/crunchstat/crunchstat_test.go
@@ -19,10 +19,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,6 +37,7 @@ 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 {