Merge pull request #199 from ClusterHQ/fix-tests

Unbreak tests.

Author: itamarst

eliot/tests/test_output.py

@@ -11,6 +11,7 @@
 import json as pyjson
 from tempfile import mktemp
 from time import time
+from uuid import UUID
 
 from six import PY3, PY2
 
@@ -556,14 +557,16 @@ def test_destinationMultipleExceptionsCaught(self):
 
         def remove(key):
             return [message.pop(key) for message in messages[1:]]
+
+        # Make sure we have task_level & task_uuid in exception messages.
         task_levels = remove(u"task_level")
         task_uuids = remove(u"task_uuid")
         timestamps = remove(u"timestamp")
 
         self.assertEqual(
-            (task_levels[1][-1] == task_levels[0][-1] + 1,
-             task_uuids[0] == task_uuids[1],
-             abs(timestamps[0] + timestamps[1] - 2 * time()) < 1,
+            (abs(timestamps[0] + timestamps[1] - 2 * time()) < 1,
+             task_levels == [[1], [1]],
+             len([UUID(uuid) for uuid in task_uuids]) == 2,
              messages),
             (True, True, True,
              [message,