Restructure tests, fix up a few other things, rework smokevirt thoroughly

Author: ianmcorvidae

meshtastic/node.py

@@ -287,12 +287,22 @@ def deleteChannel(self, channelIndex):
         # for sending admin channels will also change
         adminIndex = self.iface.localNode._getAdminChannelIndex()
 
+        # Snapshot serialized channel payloads from channelIndex onward so we
+        # can avoid writing slots whose protobuf content did not change after
+        # the shift. Use bytes (not message objects), because _fixupChannels()
+        # mutates message fields in-place.
+        old_channels = [
+            self.channels[i].SerializeToString()
+            for i in range(channelIndex, len(self.channels))
+        ]
+
         self.channels.pop(channelIndex)
         self._fixupChannels()  # expand back to 8 channels
 
         index = channelIndex
-        while index < 8:
-            self.writeChannel(index, adminIndex=adminIndex)
+        for old_ch in old_channels:
+            if self.channels[index].SerializeToString() != old_ch:
+                self.writeChannel(index, adminIndex=adminIndex)
             index += 1
 
             # if we are updating the local node, we might end up

meshtastic/tests/conftest.py

@@ -17,7 +17,7 @@
 )
 
 # Use a different base port for the single-node fixture so it doesn't
-# conflict with the multi-node mesh fixture (both are session-scoped).
+# conflict with the multi-node mesh fixture.
 SINGLE_NODE_BASE_PORT = DEFAULT_BASE_PORT + 100
 
 
@@ -31,10 +31,15 @@ def _skip_firmware_if_unavailable() -> None:
         )
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="function")
 def firmware_node():
     """A single meshtasticd sim node for smokevirt tests.
 
+    Function-scoped so every test gets a freshly-erased node with no
+    state leaking from previous tests. This makes destructive commands
+    (``--reboot``, ``--set factory_reset true``) safe to run and lets
+    tests be order-independent.
+
     Yields the SimNode instance.  The node is booted with a fresh erased
     config and listens on localhost at its TCP port.
     """

meshtastic/tests/firmware_harness.py

@@ -161,6 +161,9 @@ def _kill(self) -> None:
                     os.killpg(os.getpgid(self.process.pid), signal.SIGKILL)
                 except Exception:
                     pass
+            # Give OS time to release TCP port (avoid TIME_WAIT preventing
+            # next instance from binding the same port)
+            time.sleep(1.0)
             self.process = None