Fix flake-inducing race condition in test harness (#184)

Set nat-only to fix test_service_ipv4_unknown_address

Author: Nieuwejaar

dpd-client/tests/integration_tests/common.rs

@@ -708,9 +708,7 @@ impl Switch {
         let n_total_packets = send.len() + expect.len();
         let mut captured = Vec::with_capacity(n_total_packets);
         let now = std::time::Instant::now();
-        while now.elapsed() < self.packet_timeout
-            && captured.len() < n_total_packets
-        {
+        while now.elapsed() < self.packet_timeout {
             captured.extend(self.collected_packets_get());
             thread::sleep(Duration::from_millis(10));
         }

dpd-client/tests/integration_tests/mcast.rs

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/
 //
-// Copyright 2025 Oxide Computer Company
+// Copyright 2026 Oxide Computer Company
 
 use std::{
     collections::HashSet,
@@ -3783,6 +3783,10 @@ async fn test_multicast_reset_all_tables() -> TestResult {
     Ok(())
 }
 
+/*
+ * Commented out untl https://github.com/oxidecomputer/dendrite/issues/107 is
+ * fixed
+ *
 #[tokio::test]
 #[ignore]
 async fn test_multicast_vlan_translation_not_possible() -> TestResult {
@@ -3859,6 +3863,7 @@ async fn test_multicast_vlan_translation_not_possible() -> TestResult {
         .unwrap();
     cleanup_test_group(switch, internal_multicast_ip).await
 }
+*/
 
 #[tokio::test]
 #[ignore]

dpd-client/tests/integration_tests/service.rs

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/
 //
-// Copyright 2025 Oxide Computer Company
+// Copyright 2026 Oxide Computer Company
 
 use std::sync::Arc;
 
@@ -195,17 +195,32 @@ async fn test_service_ipv4_unknown_address() -> TestResult {
         .await
         .unwrap();
 
+    // Mark the port as NAT-only
+    switch
+        .client
+        .link_nat_only_set(&port_id, &link_id, true)
+        .await
+        .unwrap();
+
     let send_pkt = common::gen_udp_packet(
         Endpoint::parse("e0:d5:5e:67:89:ab", "10.10.10.10", 3333).unwrap(),
         Endpoint::parse(router_mac, "192.10.12.1", 4444).unwrap(),
     );
 
     let send = TestPacket {
         packet: Arc::new(send_pkt),
-        port: PhysPort(ingress + 1),
+        port: PhysPort(ingress),
     };
 
-    switch.packet_test(vec![send], Vec::new())
+    let result = switch.packet_test(vec![send], Vec::new());
+    // Clear the port's NAT-only property
+    switch
+        .client
+        .link_nat_only_set(&port_id, &link_id, false)
+        .await
+        .unwrap();
+
+    result
 }
 
 #[tokio::test]

xtask/src/linux.rs

@@ -21,7 +21,7 @@ fn collect(src: &str, dst: &str, files: Vec<&str>) -> Result<()> {
 
     let dst_dir = Path::new(&dst);
     if !dst_dir.is_dir() {
-        fs::create_dir_all(&dst_dir)?;
+        fs::create_dir_all(dst_dir)?;
     }
 
     for f in files {