14715: keepproxy.service checks for cluster config

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

diff --git a/lib/crunchstat/crunchstat_test.go b/lib/crunchstat/crunchstat_test.go
index 864a3e3456e6afdba773158594e71f17b9808493..c27e39241df08af2c925a791e6fd849afc496b90 100644 (file)
--- 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)
        }
 }