2 files changed, 35 insertions, 1 deletions

diff --git a/tests/integration/test_config.py b/tests/integration/test_config.py
new file mode 100644
index 0000000..1a84fa7
--- /dev/null
+++ b/tests/integration/test_config.py
@@ -0,0 +1,29 @@
+"""Settings the tracker has to accept, and still work with.
+
+An unrecognised key makes opentracker refuse to start, so a test that it
+comes up at all is a test that the key was understood.
+"""
+
+import unittest
+
+from harness import Tracker, TrackerTestCase, free_port
+
+
+class TcpWorkers(TrackerTestCase):
+    config = "listen.tcp.workers 2\n"
+
+    def test_the_tracker_serves_with_tcp_workers_asked_for(self):
+        self.assertEqual(self.tracker.announce(self.hash_for("tcpworkers"))[b"complete"], 1)
+
+
+class WorkersOnAListenStatement(unittest.TestCase):
+    def test_a_listen_statement_may_carry_a_worker_count(self):
+        """The option is read off the statement rather than inherited."""
+        second = free_port()
+        tracker = Tracker("listen.tcp 127.0.0.1:%d workers=2\n" % second)
+        try:
+            self.assertEqual(tracker.announce(b"listenopts\0\0\0\0\0\0\0\0\0\0")[b"complete"], 1)
+            complaints = tracker.stop()
+            self.assertEqual(complaints, [], "the tracker reported:\n" + "\n".join(complaints))
+        finally:
+            tracker._cleanup()
diff --git a/tests/integration/test_expiry.py b/tests/integration/test_expiry.py
index 5a21e57..5e6dc0a 100644
--- a/tests/integration/test_expiry.py
+++ b/tests/integration/test_expiry.py
@@ -27,6 +27,11 @@ class ExpirySweep(TrackerTestCase):
     def test_the_sweep_takes_the_idle_and_leaves_the_answered(self):
         idle = socket.create_connection(("127.0.0.1", self.tracker.port), timeout=5)
         try:
+            # Enough for a kernel that holds a connection back until data
+            # arrives to hand it over, and far too little to be answered, so
+            # the tracker has accepted it and is waiting for the rest
+            idle.sendall(b"GET /ann")
+
             self.assertEqual(self.tracker.announce(self.hash_for("expiry-sweep"))[b"complete"], 1)
 
             time.sleep(CLIENT_TIMEOUT + 3 * CHECK_INTERVAL)
@@ -34,6 +39,6 @@ class ExpirySweep(TrackerTestCase):
             self.assertEqual(self.tracker.torrent_count(), 1, "the tracker stopped serving while sweeping")
 
             idle.settimeout(5)
-            self.assertEqual(idle.recv(64), b"", "a connection that never sent a request was not swept")
+            self.assertEqual(idle.recv(64), b"", "a connection that went quiet mid-request was not swept")
         finally:
             idle.close()