Merge branch 'master' of github.com:quantopian/qsim

test.py

@@ -1,6 +0,0 @@
-import unittest
-from test.testmessaging import *
-
-if __name__ == '__main__':
-    suite = unittest.TestLoader().loadTestsFromTestCase(MessagingTestCase)
-    unittest.TextTestRunner(verbosity=2).run(suite)

test/test_messaging.py

@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import zmq
 import logging
 import tornado
@@ -63,4 +63,4 @@ class MessagingTestCase(unittest.TestCase):
         client.run()
         self.assertEqual(self.feed.data_buffer.pending_messages(), 0, "The feed should be drained of all messages.")
         self.assertEqual(self.total_data_count, client.received_count, "The client should have received the same number of messages as the feed sent.")
-        
+