src/tests/core.py

@@ -310,26 +310,6 @@ class TestCore(unittest.TestCase):
         else:
             return self.fail('No Announcer thread found')
 
-        for _ in range(20):  # wait for UDP socket
-            for sock in BMConnectionPool().udpSockets.values():
-                thread.announceSelf()
-                break
-            else:
-                time.sleep(1)
-                continue
-            break
-        else:
-            self.fail('UDP socket is not started')
-
-        for _ in range(20):
-            if state.discoveredPeers:
-                peer = state.discoveredPeers.keys()[0]
-                self.assertEqual(peer.port, 8444)
-                break
-            time.sleep(1)
-        else:
-            self.fail('No self in discovered peers')
-
     @staticmethod
     def _decode_msg(data, pattern):
         proto = BMProto()

src/tests/test_network.py

@@ -19,6 +19,7 @@ class TestNetwork(TestPartialRun):
         cls.state.maximumNumberOfHalfOpenConnections = 4
 
         cls.config.set('bitmessagesettings', 'sendoutgoingconnections', 'True')
+        cls.config.set('bitmessagesettings', 'udp', 'True')
 
         # config variable is still used inside of the network ):
         import network
@@ -34,18 +35,14 @@ class TestNetwork(TestPartialRun):
     def test_threads(self):
         """Ensure all the network threads started"""
         threads = {
-            "AddrBroadcaster", "Asyncore", "Downloader", "InvBroadcaster",
+            "AddrBroadcaster", "Announcer", "Asyncore", "Downloader",
-            "Uploader"}
+            "InvBroadcaster", "Uploader"}
-        extra = (
+        extra = self.config.getint('threads', 'receive')
-            self.config.getint('threads', 'receive')
-            + self.config.safeGetBoolean('bitmessagesettings', 'udp'))
         for thread in threading.enumerate():
             try:
                 threads.remove(thread.name)
             except KeyError:
-                extra -= (
+                extra -= thread.name.startswith("ReceiveQueue_")
-                    thread.name == "Announcer"
-                    or thread.name.startswith("ReceiveQueue_"))
 
         self.assertEqual(len(threads), 0)
         self.assertEqual(extra, 0)
@@ -66,6 +63,31 @@ class TestNetwork(TestPartialRun):
         else:
             self.fail('Have not started any connection in 30 sec')
 
+    def test_udp(self):
+        """Invoke AnnounceThread.announceSelf() and check discovered peers"""
+        for _ in range(20):
+            if self.pool.udpSockets:
+                break
+            time.sleep(1)
+        else:
+            self.fail('No UDP sockets found in 20 sec')
+
+        for _ in range(10):
+            try:
+                self.state.announceThread.announceSelf()
+            except AttributeError:
+                self.fail('state.announceThread is not set properly')
+            time.sleep(1)
+            try:
+                peer = self.state.discoveredPeers.popitem()[0]
+            except KeyError:
+                continue
+            else:
+                self.assertEqual(peer.port, 8444)
+                break
+        else:
+            self.fail('No self in discovered peers')
+
     @classmethod
     def tearDownClass(cls):
         super(TestNetwork, cls).tearDownClass()