Regression tests for swadm

.github/buildomat/packet-test-common.sh

@@ -97,22 +97,6 @@ banner "Links"
 
 ./target/debug/swadm --host '[::1]' link ls || echo "failed to list links"
 
-banner "swadm Checks"
-
-pushd swadm
-
-DENDRITE_TEST_HOST='[::1]' \
-    DENDRITE_TEST_VERBOSITY=3 \
-    cargo test \
-    --no-fail-fast \
-    $SWADM_FEATURES \
-    --test \
-    counters \
-    -- \
-    --ignored
-
-popd
-
 banner "Packet Tests"
 
 set +o errexit
@@ -132,3 +116,19 @@ DENDRITE_TEST_HOST='[::1]' \
     -- \
     --ignored \
     --skip succeeds_when_table_fragmented
+
+popd
+
+banner "swadm checks"
+
+pushd swadm
+
+DENDRITE_TEST_HOST='[::1]' \
+    DENDRITE_TEST_VERBOSITY=3 \
+    cargo test \
+    --no-fail-fast \
+    $SWADM_FEATURES \
+    -- \
+    --ignored
+
+popd

Cargo.toml

@@ -74,7 +74,7 @@ curl = "0.4"
 dropshot = "0.17.1"
 dropshot-api-manager = "0.7.2"
 dropshot-api-manager-types = "0.7.2"
-expectorate = "1"
+expectorate = { version = "1.3.0", features = ["predicates"] }
 futures = "0.3"
 http = "1.4.2"
 humantime = "2.3"
@@ -88,7 +88,6 @@ openssl = "0.10"
 oxide-tokio-rt = "0.1.2"
 parking_lot = "0.12"
 pretty_assertions = "1.4"
-proc-macro2 = "1.0"
 progenitor = "0.14"
 rand = "0.9"
 regex = "1.12"
@@ -100,6 +99,7 @@ scuffle = { version = "0.1.0", features = ["smf-by-instance"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serial_test = "3.5.0"
 signal-hook = "0.4"
 signal-hook-tokio = { version = "0.4", features = [ "futures-v0_3" ] }
 slog = { version = "2.7", features = [ "release_max_level_debug", "max_level_trace" ] }
@@ -108,7 +108,6 @@ slog-bunyan = "2.5"
 slog-term = "2.9"
 socket2 = { version = "0.6", features = ["all"] }
 strum = { version = "0.28", features = [ "derive" ] }
-syn = { version = "2.0", features = ["extra-traits"]}
 tabwriter = { version = "1", features = ["ansi_formatting"] }
 thiserror = "2.0"
 tokio = "1.37"

swadm/Cargo.toml

@@ -24,3 +24,9 @@ reqwest.workspace = true
 slog.workspace = true
 tabwriter.workspace = true
 tokio.workspace = true
+
+[dev-dependencies]
+expectorate.workspace = true
+predicates = "3.1.4"
+serial_test.workspace = true
+thiserror.workspace = true

swadm/README.md

@@ -0,0 +1,17 @@
+# SW(itch) ADM(in)
+
+This is the management CLI for Oxide's rack switch.
+
+## Testing
+
+swadm is widely used across scripts and documentation. Changes
+should generally be backward compatible.
+
+This is definitionally a string-typed interface, so regressions are
+easily missed. The integration tests module has infra for testing
+commands, and adding a test before making swadm changes might
+help prevent drift.
+
+These tests are run in Linux CI but currently ignored in Illumos CI.
+Illumos CI is blocked by tofino simulator support: https://github.com/oxidecomputer/tofino-sde/issues/21
+