1 files changed, 36 insertions, 13 deletions

diff --git a/tests/integration/test_stats.py b/tests/integration/test_stats.py
index 920d199..820b917 100644
--- a/tests/integration/test_stats.py
+++ b/tests/integration/test_stats.py
@@ -5,7 +5,9 @@ every one of them and, where the number means something, that it moves when
 the thing it counts happens.
 """
 
+import ipaddress
 import re
+import socket
 import unittest
 import urllib.error
 import xml.etree.ElementTree
@@ -14,8 +16,7 @@ from harness import TrackerTestCase
 
 # The modes a default build answers. "tpbs" and "statedump" are full scrapes
 # and belong to test_fullscrape; "fulllog" and "woodpeckers" sit behind
-# feature flags this build does not set; "busy" is advertised but unbuilt,
-# which the next case pins.
+# feature flags this build does not set.
 MRTG_MODES = ["peer", "conn", "scrp", "udp4", "tcp4", "torr", "fscr", "completed", "syncs"]
 TEXT_MODES = ["herr", "s24s", "top10", "top100", "renew", "version"]
 
@@ -34,14 +35,14 @@ class StatsShape(TrackerTestCase):
             for line in lines[:2]:
                 self.assertRegex(line, rb"^\d+$", "mode %s line %r" % (mode, line))
 
-    def test_the_busy_mode_is_advertised_but_not_built(self):
-        """TASK_STATS_BUSY_NETWORKS is in the enum and in the mode table, and
-        no switch anywhere handles it, so the worker frees the empty answer
-        and the request ends as a server error. Pinned rather than blessed:
-        either the report gets written or the mode leaves the table."""
+    def test_the_busy_mode_is_gone(self):
+        """It was listed in the mode table and implemented nowhere, so it only
+        ever answered 500. Removed rather than written: picking poisoning
+        networks out stopped being meaningful once consumer lines became bot
+        hosts and v6 made the address space too large to watch."""
         with self.assertRaises(urllib.error.HTTPError) as caught:
             self.tracker.stats("busy")
-        self.assertEqual(caught.exception.code, 500)
+        self.assertEqual(caught.exception.code, 400, "an unknown mode, like any other")
 
     def test_an_unknown_mode_is_refused(self):
         with self.assertRaises(urllib.error.HTTPError) as caught:
@@ -131,15 +132,37 @@ class StatsTop(TrackerTestCase):
 
 
 class StatsNetworks(TrackerTestCase):
-    def test_the_slash24_report_names_the_loopback_network(self):
+    def source_address(self):
+        """Which address the tracker sees us from is not ours to choose: a
+        FreeBSD jail relocates a loopback connection to the jail's own
+        address, so ask the socket rather than assume 127.0.0.1."""
+        probe = socket.create_connection(("127.0.0.1", self.tracker.port), timeout=5)
+        try:
+            return probe.getsockname()[0]
+        finally:
+            probe.close()
+
+    def test_the_slash24_report_names_the_announcing_network(self):
+        source = self.source_address()
         self.tracker.announce(self.hash_for("s24"), port=6001, left=0)
         body = self.tracker.stats("s24s")
         self.assertIn(b"Networks, limit /28:", body)
         self.assertIn(b"Networks, limit /24:", body)
-        # The prefix is masked out of a v4 peer's four address bytes and then
-        # printed through the v6 formatter, so 127.0.0.0/24 reads as "7f00::"
-        # rather than as an address anyone would recognise. Pinned as it is.
-        self.assertIn(b"7f00::", body)
+
+        # The prefix is the first three address bytes of a v4 peer, left
+        # aligned in a sixteen byte buffer and then printed by the v6
+        # formatter, so 127.0.0.0/24 reads as "7f00::" rather than as the
+        # network an operator asked about. Pinned as it is, not blessed.
+        prefix = socket.inet_aton(source)[:3] + b"\0" * 13
+        self.assertIn(str(ipaddress.IPv6Address(prefix)).encode(), body)
+
+    def test_the_report_counts_one_network_per_announcing_address(self):
+        for port in (6001, 6002, 6003):
+            self.tracker.announce(self.hash_for("s24count"), port=port, left=0)
+        lines = [line for line in self.tracker.stats("s24s").splitlines() if b":" in line and b"limit" not in line]
+        self.assertEqual(len(lines), 2, "one line under each of the two limits")
+        for line in lines:
+            self.assertEqual(int(line.split(b":")[0]), 3, "three peers from the one network")
 
 
 if __name__ == "__main__":