fix race conditions in threaded tests

Add extra time for threads to catch up in slower runs,
ensure the dictionary ordering used by worker is deterministic.

Change-Id: I1013a69116ebdcbe64d7c6dfae12ca791256aebf

Author: zzzeek

sqlalchemy_collectd/client/tests/test_worker.py

@@ -60,7 +60,7 @@ def start_loop():
 
             # now wait, it will hit the SystemExit and exit.
             # if it times out, we failed.
-            worker._WORKER_THREAD.join(1)
+            worker._WORKER_THREAD.join(5)
 
         # see that it did what we asked.
         self.assertEqual(

sqlalchemy_collectd/client/worker.py

@@ -1,3 +1,4 @@
+import collections
 import logging
 import os
 import threading
@@ -9,7 +10,7 @@
 _WORKER_THREAD = None
 _PID = os.getpid()
 
-_collection_targets = {}
+_collection_targets = collections.OrderedDict()
 
 
 def _check_threads_started():

sqlalchemy_collectd/server/tests/test_listener.py

@@ -30,7 +30,7 @@ def receive():
         with mock.patch.object(listener, "log") as mock_logger:
             listener.listen(mock.Mock(receive=receive))
 
-        listener.listen_thread.join(1)
+        listener.listen_thread.join(5)
 
         # call "five" doesn't happen because we should have exited
         self.assertEqual(