treewide: remove usage of osbase/test/launch for logging
Change-Id: Ib0279f1f1cbbefeb5064e78cfb36b0bf7a59f5cb
Reviewed-on: https://review.monogon.dev/c/monogon/+/4045
Tested-by: Jenkins CI
Reviewed-by: Jan Schär <jan@monogon.tech>
diff --git a/metropolis/test/e2e/suites/core/BUILD.bazel b/metropolis/test/e2e/suites/core/BUILD.bazel
index 662ed28..9671f9f 100644
--- a/metropolis/test/e2e/suites/core/BUILD.bazel
+++ b/metropolis/test/e2e/suites/core/BUILD.bazel
@@ -23,7 +23,6 @@
"//metropolis/test/launch",
"//metropolis/test/localregistry",
"//metropolis/test/util",
- "//osbase/test/launch",
"@io_bazel_rules_go//go/runfiles",
"@org_golang_google_grpc//:grpc",
],
diff --git a/metropolis/test/e2e/suites/core/run_test.go b/metropolis/test/e2e/suites/core/run_test.go
index dca9b7d..f6fd24c 100644
--- a/metropolis/test/e2e/suites/core/run_test.go
+++ b/metropolis/test/e2e/suites/core/run_test.go
@@ -20,15 +20,14 @@
"github.com/bazelbuild/rules_go/go/runfiles"
"google.golang.org/grpc"
+ apb "source.monogon.dev/metropolis/proto/api"
+ cpb "source.monogon.dev/metropolis/proto/common"
+
common "source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/rpc"
mlaunch "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/localregistry"
"source.monogon.dev/metropolis/test/util"
- "source.monogon.dev/osbase/test/launch"
-
- apb "source.monogon.dev/metropolis/proto/api"
- cpb "source.monogon.dev/metropolis/proto/common"
)
var (
@@ -100,8 +99,6 @@
}
}()
- launch.Log("E2E: Cluster running, starting tests...")
-
// Dial first node's curator.
creds := rpc.NewAuthenticatedCredentials(cluster.Owner, rpc.WantInsecure())
remote := net.JoinHostPort(cluster.Nodes[cluster.NodeIDs[0]].ManagementAddress, common.CuratorServicePort.PortString())
diff --git a/metropolis/test/e2e/suites/ha/BUILD.bazel b/metropolis/test/e2e/suites/ha/BUILD.bazel
index cc792a3..a42e4e9 100644
--- a/metropolis/test/e2e/suites/ha/BUILD.bazel
+++ b/metropolis/test/e2e/suites/ha/BUILD.bazel
@@ -19,7 +19,6 @@
"//metropolis/test/launch",
"//metropolis/test/localregistry",
"//metropolis/test/util",
- "//osbase/test/launch",
"@io_bazel_rules_go//go/runfiles",
],
)
diff --git a/metropolis/test/e2e/suites/ha/run_test.go b/metropolis/test/e2e/suites/ha/run_test.go
index b56e40c..ce1d48d 100644
--- a/metropolis/test/e2e/suites/ha/run_test.go
+++ b/metropolis/test/e2e/suites/ha/run_test.go
@@ -15,7 +15,6 @@
mlaunch "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/localregistry"
"source.monogon.dev/metropolis/test/util"
- "source.monogon.dev/osbase/test/launch"
)
var (
@@ -82,8 +81,6 @@
}
}()
- launch.Log("E2E: Cluster running, starting tests...")
-
util.MustTestEventual(t, "Add ConsensusMember roles", ctx, smallTestTimeout, func(ctx context.Context) error {
// Make everything but the first node into ConsensusMember.
for i := 1; i < clusterOptions.NumNodes; i++ {
diff --git a/metropolis/test/e2e/suites/ha_cold/BUILD.bazel b/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
index a70ee55..bad018a 100644
--- a/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
+++ b/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
@@ -15,7 +15,6 @@
"//metropolis/proto/common",
"//metropolis/test/launch",
"//metropolis/test/util",
- "//osbase/test/launch",
"@io_k8s_utils//ptr",
],
)
diff --git a/metropolis/test/e2e/suites/ha_cold/run_test.go b/metropolis/test/e2e/suites/ha_cold/run_test.go
index 0684a0b..f0ce676 100644
--- a/metropolis/test/e2e/suites/ha_cold/run_test.go
+++ b/metropolis/test/e2e/suites/ha_cold/run_test.go
@@ -13,7 +13,6 @@
mlaunch "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/util"
- "source.monogon.dev/osbase/test/launch"
ipb "source.monogon.dev/metropolis/node/core/curator/proto/api"
apb "source.monogon.dev/metropolis/proto/api"
@@ -63,8 +62,6 @@
}
}()
- launch.Log("E2E: Cluster running, starting tests...")
-
util.MustTestEventual(t, "Add ConsensusMember roles", ctx, smallTestTimeout, func(ctx context.Context) error {
// Make everything but the first node into ConsensusMember.
for i := 1; i < clusterOptions.NumNodes; i++ {
diff --git a/metropolis/test/util/BUILD.bazel b/metropolis/test/util/BUILD.bazel
index 84a9c3b..c2baf89 100644
--- a/metropolis/test/util/BUILD.bazel
+++ b/metropolis/test/util/BUILD.bazel
@@ -15,7 +15,6 @@
"//metropolis/proto/common",
"//osbase/event/memory",
"//osbase/pki",
- "//osbase/test/launch",
"@com_zx2c4_golang_wireguard_wgctrl//wgtypes",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//credentials/insecure",
diff --git a/metropolis/test/util/runners.go b/metropolis/test/util/runners.go
index 4a8a1e9..03e3801 100644
--- a/metropolis/test/util/runners.go
+++ b/metropolis/test/util/runners.go
@@ -11,8 +11,6 @@
"fmt"
"testing"
"time"
-
- "source.monogon.dev/osbase/test/launch"
)
// TestEventual creates a new subtest looping the given function until it either
@@ -23,14 +21,14 @@
start := time.Now()
ctx, cancel := context.WithTimeout(ctx, timeout)
t.Helper()
- launch.Log("Test: %s: starting...", name)
+ fmt.Printf("Test: %s: starting...\n", name)
return t.Run(name, func(t *testing.T) {
defer cancel()
var lastErr = errors.New("test didn't run to completion at least once")
for {
err := f(ctx)
if err == nil {
- launch.Log("Test: %s: okay after %.1f seconds", name, time.Since(start).Seconds())
+ fmt.Printf("Test: %s: okay after %.1f seconds\n", name, time.Since(start).Seconds())
return
}
if errors.Is(err, ctx.Err()) {