m/test/e2e: use concise-style logging
Making our test logs look like LogEntry.ConciseString() means we have
significantly more readable test logs.
Change-Id: I0b1eab6a5a837bb2001f3b32779c23df2feaa381
Reviewed-on: https://review.monogon.dev/c/monogon/+/1362
Reviewed-by: Leopold Schabel <leo@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/test/e2e/main_test.go b/metropolis/test/e2e/main_test.go
index 7ee63d0..c3f6a3c 100644
--- a/metropolis/test/e2e/main_test.go
+++ b/metropolis/test/e2e/main_test.go
@@ -21,7 +21,6 @@
"errors"
"fmt"
"io"
- "log"
"net"
"net/http"
_ "net/http"
@@ -41,6 +40,7 @@
"source.monogon.dev/metropolis/node/core/identity"
"source.monogon.dev/metropolis/node/core/rpc"
apb "source.monogon.dev/metropolis/proto/api"
+ "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/launch/cluster"
"source.monogon.dev/metropolis/test/util"
)
@@ -70,12 +70,12 @@
pprofListen, err := net.ListenTCP("tcp", addr)
if err != nil {
- log.Fatalf("Failed to listen on pprof port: %s", pprofListen.Addr())
+ launch.Fatal("Failed to listen on pprof port: %s", pprofListen.Addr())
}
- log.Printf("E2E: pprof server listening on %s", pprofListen.Addr())
+ launch.Log("E2E: pprof server listening on %s", pprofListen.Addr())
go func() {
- log.Printf("E2E: pprof server returned an error: %v", http.Serve(pprofListen, nil))
+ launch.Log("E2E: pprof server returned an error: %v", http.Serve(pprofListen, nil))
pprofListen.Close()
}()
@@ -98,7 +98,7 @@
}
}()
- log.Printf("E2E: Cluster running, starting tests...")
+ launch.Log("E2E: Cluster running, starting tests...")
// Dial first node's curator.
creds := rpc.NewAuthenticatedCredentials(cluster.Owner, nil)