osbase: move test packages under osbase/test
The cmd, freeport and socksproxy packages are only used in tests, and
are also intended to be only used in tests. This change moves these
packages under osbase/test.
Change-Id: I8fe679945990c295bdf822abfce56c25233c4588
Reviewed-on: https://review.monogon.dev/c/monogon/+/4564
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/cli/metroctl/test/BUILD.bazel b/metropolis/cli/metroctl/test/BUILD.bazel
index edaa112..3632a44 100644
--- a/metropolis/cli/metroctl/test/BUILD.bazel
+++ b/metropolis/cli/metroctl/test/BUILD.bazel
@@ -14,7 +14,7 @@
deps = [
"//metropolis/test/launch",
"//metropolis/test/util",
- "//osbase/cmd",
+ "//osbase/test/cmd",
"@io_bazel_rules_go//go/runfiles",
],
)
diff --git a/metropolis/cli/metroctl/test/main_test.go b/metropolis/cli/metroctl/test/main_test.go
index b853b82..f44f508 100644
--- a/metropolis/cli/metroctl/test/main_test.go
+++ b/metropolis/cli/metroctl/test/main_test.go
@@ -18,7 +18,7 @@
mlaunch "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/util"
- "source.monogon.dev/osbase/cmd"
+ "source.monogon.dev/osbase/test/cmd"
)
var (
diff --git a/metropolis/cli/takeover/e2e/BUILD.bazel b/metropolis/cli/takeover/e2e/BUILD.bazel
index d01812e..6cebd51 100644
--- a/metropolis/cli/takeover/e2e/BUILD.bazel
+++ b/metropolis/cli/takeover/e2e/BUILD.bazel
@@ -23,8 +23,8 @@
},
deps = [
"//osbase/fat32",
- "//osbase/freeport",
"//osbase/structfs",
+ "//osbase/test/freeport",
"@io_bazel_rules_go//go/runfiles",
"@org_golang_x_crypto//ssh",
"@org_golang_x_crypto//ssh/agent",
diff --git a/metropolis/cli/takeover/e2e/main_test.go b/metropolis/cli/takeover/e2e/main_test.go
index 556f300..c86a48d 100644
--- a/metropolis/cli/takeover/e2e/main_test.go
+++ b/metropolis/cli/takeover/e2e/main_test.go
@@ -25,8 +25,8 @@
"golang.org/x/sys/unix"
"source.monogon.dev/osbase/fat32"
- "source.monogon.dev/osbase/freeport"
"source.monogon.dev/osbase/structfs"
+ "source.monogon.dev/osbase/test/freeport"
)
var (
diff --git a/metropolis/installer/test/BUILD.bazel b/metropolis/installer/test/BUILD.bazel
index 8c6bc8d..ff8cb00 100644
--- a/metropolis/installer/test/BUILD.bazel
+++ b/metropolis/installer/test/BUILD.bazel
@@ -25,10 +25,10 @@
"//metropolis/cli/metroctl/core",
"//metropolis/installer/install",
"//metropolis/proto/api",
- "//osbase/cmd",
"//osbase/oci",
"//osbase/oci/osimage",
"//osbase/structfs",
+ "//osbase/test/cmd",
"@com_github_diskfs_go_diskfs//:go-diskfs",
"@com_github_diskfs_go_diskfs//disk",
"@com_github_diskfs_go_diskfs//partition/gpt",
diff --git a/metropolis/installer/test/run_test.go b/metropolis/installer/test/run_test.go
index 898ad44..3b7de86 100644
--- a/metropolis/installer/test/run_test.go
+++ b/metropolis/installer/test/run_test.go
@@ -25,10 +25,10 @@
mctl "source.monogon.dev/metropolis/cli/metroctl/core"
"source.monogon.dev/metropolis/installer/install"
- "source.monogon.dev/osbase/cmd"
"source.monogon.dev/osbase/oci"
"source.monogon.dev/osbase/oci/osimage"
"source.monogon.dev/osbase/structfs"
+ "source.monogon.dev/osbase/test/cmd"
)
var (
diff --git a/metropolis/node/core/metrics/BUILD.bazel b/metropolis/node/core/metrics/BUILD.bazel
index 893a6c4..bc94863 100644
--- a/metropolis/node/core/metrics/BUILD.bazel
+++ b/metropolis/node/core/metrics/BUILD.bazel
@@ -35,8 +35,8 @@
"//metropolis/node",
"//metropolis/node/core/curator/proto/api",
"//metropolis/test/util",
- "//osbase/freeport",
"//osbase/supervisor",
+ "//osbase/test/freeport",
"@com_zx2c4_golang_wireguard_wgctrl//wgtypes",
"@io_bazel_rules_go//go/runfiles",
],
diff --git a/metropolis/node/core/metrics/metrics_test.go b/metropolis/node/core/metrics/metrics_test.go
index b7c3eab..ebb59a9 100644
--- a/metropolis/node/core/metrics/metrics_test.go
+++ b/metropolis/node/core/metrics/metrics_test.go
@@ -22,8 +22,8 @@
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/test/util"
- "source.monogon.dev/osbase/freeport"
"source.monogon.dev/osbase/supervisor"
+ "source.monogon.dev/osbase/test/freeport"
)
var (
diff --git a/metropolis/test/nanoswitch/BUILD.bazel b/metropolis/test/nanoswitch/BUILD.bazel
index d7f9d12..9aff921 100644
--- a/metropolis/test/nanoswitch/BUILD.bazel
+++ b/metropolis/test/nanoswitch/BUILD.bazel
@@ -14,8 +14,8 @@
"//metropolis/node/core/network/dhcp4c",
"//metropolis/node/core/network/dhcp4c/callback",
"//osbase/bringup",
- "//osbase/socksproxy",
"//osbase/supervisor",
+ "//osbase/test/socksproxy",
"@com_github_google_nftables//:nftables",
"@com_github_google_nftables//expr",
"@com_github_insomniacslk_dhcp//dhcpv4",
diff --git a/metropolis/test/nanoswitch/socks.go b/metropolis/test/nanoswitch/socks.go
index 15e0f81..41efcde 100644
--- a/metropolis/test/nanoswitch/socks.go
+++ b/metropolis/test/nanoswitch/socks.go
@@ -8,8 +8,8 @@
"fmt"
"net"
- "source.monogon.dev/osbase/socksproxy"
"source.monogon.dev/osbase/supervisor"
+ "source.monogon.dev/osbase/test/socksproxy"
)
// SOCKSPort is the port at which nanoswitch listens for SOCKS conenctions.