Improve tests.

Now that jigna Python3 bug is fixed, run the integration tests on
Python3 also.

.travis.yml

@@ -24,7 +24,7 @@ before_script:
 script:
   - coverage erase
   - coverage run -p -m nose.core -v vixen/tests
-  - if [[ ${TRAVIS_PYTHON_VERSION} == "2.7" ]] ; then coverage run -p -m nose.core -v vixen/integration_tests; fi
+  - coverage run -p -m nose.core -v vixen/integration_tests
   - coverage combine
 
 after_success:

vixen/integration_tests/test_ui.py

@@ -18,6 +18,16 @@
 from vixen.tests.test_directory import make_data
 
 
+def start_io_loop():
+    ioloop = IOLoop.instance()
+    ioloop.make_current()
+    ioloop.start()
+
+
+def stop_io_loop():
+    IOLoop.instance().stop()
+
+
 class TestUI(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -27,8 +37,7 @@ def setUpClass(cls):
         ui = make_ui()
         port = 9876
         main(dev=True, port=port, test=True, **ui.get_context())
-        ioloop = IOLoop.instance()
-        t = Thread(target=ioloop.start)
+        t = Thread(target=start_io_loop)
         t.setDaemon(True)
         t.start()
 
@@ -50,8 +59,11 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.browser.quit()
-        IOLoop.instance().stop()
-        time.sleep(1)
+        IOLoop.instance().add_callback(stop_io_loop)
+        thread = cls.thread
+        count = 0
+        while thread.is_alive() and count < 50:
+            time.sleep(0.1)
         cls.thread.join()
         del os.environ['VIXEN_ROOT']
         shutil.rmtree(cls.root)