- if last_log_id == None or expected == 0:
- self.assertEqual(human['uuid'], events.get(True, 5)['object_uuid'])
- self.assertTrue(events.empty(), "got more events than expected")
- else:
- log_events = []
- for i in range(0, 20):
- try:
- event = events.get(True, 5)
- self.assertTrue(event['object_uuid'] is not None)
- log_events.append(event['object_uuid'])
- except:
- break;
-
- self.assertTrue(len(log_events)>1)
- self.assertTrue(human['uuid'] in log_events)
- self.assertTrue(ancestor['uuid'] in log_events)
+ log_object_uuids = []
+ for i in range(0, expected):
+ log_object_uuids.append(events.get(True, 5)['object_uuid'])
+
+ if expected > 0:
+ self.assertIn(human['uuid'], log_object_uuids)
+
+ if expected > 1:
+ self.assertIn(ancestor['uuid'], log_object_uuids)
+
+ with self.assertRaises(Queue.Empty):
+ # assertEqual just serves to show us what unexpected thing
+ # comes out of the queue when the assertRaises fails; when
+ # the test passes, this assertEqual doesn't get called.
+ self.assertEqual(events.get(True, 2), None)