2 files changed, 55 insertions, 6 deletions

diff --git a/tests/integration/test_stats.py b/tests/integration/test_stats.py
index 820b917..088d8a1 100644
--- a/tests/integration/test_stats.py
+++ b/tests/integration/test_stats.py
@@ -15,10 +15,10 @@ import xml.etree.ElementTree
 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.
+# 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", "version"]
+TEXT_MODES = ["herr", "s24s", "top10", "top100", "renew"]
 
 
 class StatsShape(TrackerTestCase):
@@ -55,9 +55,22 @@ class StatsShape(TrackerTestCase):
         self.assertIsNotNone(root.find("torrents/count_mutex"))
         self.assertIsNotNone(root.find("connections/tcp/announce"))
 
-    def test_version_names_a_commit(self):
-        self.assertIn(b"opentracker", self.tracker.stats("version").lower() + b"opentracker")
-        self.assertRegex(self.tracker.stats("version"), rb"https?://")
+    def test_the_version_mode_is_gone(self):
+        """Which build a tracker is and what went into it is of use to whoever
+        attacks it and to nobody else on the far end of a socket. It is
+        reported by -v, to whoever already has the binary."""
+        with self.assertRaises(urllib.error.HTTPError) as caught:
+            self.tracker.stats("version")
+        self.assertEqual(caught.exception.code, 400, "an unknown mode, like any other")
+
+    def test_everything_does_not_name_the_build(self):
+        self.assertNotIn(b"opentracker 1", self.tracker.stats("everything"))
+
+    def test_everything_does_not_name_the_tracker_id(self):
+        """The id a tracker recognises its own live sync packets by. Knowing
+        it is of no use to a client and of some use to whoever would like a
+        tracker to discard what it is told."""
+        self.assertNotIn(b"tracker_id", self.tracker.stats("everything"))
 
 
 class StatsCount(TrackerTestCase):
diff --git a/tests/integration/test_version.py b/tests/integration/test_version.py
new file mode 100644
index 0000000..66f570d
--- /dev/null
+++ b/tests/integration/test_version.py
@@ -0,0 +1,36 @@
+"""The -v report, which is where a build says what went into it.
+
+Driving the binary is the only way to see this: the feature list is a table
+of #ifdefs, so it is only true for the flags the binary itself was built with.
+"""
+
+import subprocess
+import unittest
+
+from harness import TRACKER
+
+
+class VersionFlag(unittest.TestCase):
+    def report(self):
+        # -v writes to stderr and exits before it binds anything
+        done = subprocess.run([TRACKER, "-v"], capture_output=True, timeout=30)
+        self.assertEqual(done.returncode, 0, done.stderr)
+        return done.stderr.decode()
+
+    def test_first_line_names_the_release(self):
+        # The commit in brackets is there in a checkout and in a release
+        # tarball, and absent in a build that had neither to ask.
+        first = self.report().splitlines()[0]
+        self.assertRegex(first, r"^opentracker \d+\.\d+\.\d+( \(\S+\))?$")
+
+    def test_names_the_event_mechanism(self):
+        self.assertRegex(self.report(), r"(?m)^events: (epoll|kqueue|poll)$")
+
+    def test_lists_the_features_this_build_has(self):
+        # The Makefile builds this binary with these and not with those, so a
+        # feature table that stops following the build fails here.
+        report = self.report()
+        for want in ("WANT_KEEPALIVE", "WANT_ACCESSLIST_BLACK", "WANT_DYNAMIC_ACCESSLIST"):
+            self.assertIn(want, report)
+        for unwanted in ("WANT_SPOT_WOODPECKER", "WANT_V4_ONLY", "WANT_RESTRICT_STATS"):
+            self.assertNotIn(unwanted, report)