2 files changed, 2 insertions, 47 deletions

diff --git a/tests/integration/test_concurrency.py b/tests/integration/test_concurrency.py
index 1374852..528992d 100644
--- a/tests/integration/test_concurrency.py
+++ b/tests/integration/test_concurrency.py
@@ -148,7 +148,7 @@ class ConcurrentWorkerTasks(TrackerTestCase):
 
         def poll(index):
             for _ in range(10):
-                for mode in ("everything", "top100", "peer", "torr", "s24s"):
+                for mode in ("everything", "top100", "peer", "torr"):
                     self.tracker.stats(mode)
 
         threads = [threading.Thread(target=announce, args=(i,)) for i in range(THREADS // 2)]
diff --git a/tests/integration/test_stats.py b/tests/integration/test_stats.py
index c4ac95a..46ca39b 100644
--- a/tests/integration/test_stats.py
+++ b/tests/integration/test_stats.py
@@ -5,9 +5,7 @@ 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
@@ -18,7 +16,7 @@ from harness import TrackerTestCase
 # and belong to test_fullscrape; "woodpeckers" sits behind a
 # feature flag this build does not set.
 MRTG_MODES = ["peer", "conn", "scrp", "udp4", "tcp4", "torr", "fscr", "completed", "syncs"]
-TEXT_MODES = ["herr", "s24s", "top10", "top100", "renew"]
+TEXT_MODES = ["herr", "top10", "top100", "renew"]
 
 
 class StatsShape(TrackerTestCase):
@@ -144,48 +142,5 @@ class StatsTop(TrackerTestCase):
             self.assertIn(heading, body)
 
 
-class StatsNetworks(TrackerTestCase):
-    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 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")
-
-    def test_the_report_survives_a_torrent_with_no_v4_peers(self):
-        # A torrent whose only peer is v6 has no v4 peer list once the lists
-        # are allocated on demand. The s24 report walks the v4 list of every
-        # torrent, so it has to skip the absent one rather than follow a null
-        # pointer. Needs WANT_IP_FROM_QUERY_STRING to force the family; without
-        # it the peer is loopback v4 and the walk is never asked to skip.
-        self.tracker.announce(self.hash_for("s24v6only"), ip="2001:db8::1", port=6001, left=0)
-        self.assertIn(b"Networks, limit /24:", self.tracker.stats("s24s"))
-
-
 if __name__ == "__main__":
     unittest.main()