[tests] Enabling 2 skipped tests

Adapted to run on current application module

1 files changed, 28 insertions, 16 deletions

diff --git a/service/test/unit/config/test_app_factory.py b/service/test/unit/config/test_app_factory.py
index a43273c3..b2799d4c 100644
--- a/service/test/unit/config/test_app_factory.py
+++ b/service/test/unit/config/test_app_factory.py
@@ -4,7 +4,7 @@ from mock import patch, MagicMock, ANY
 import pixelated
 
 
-class AppFactoryTest(unittest.TestCase):
+class ApplicationTest(unittest.TestCase):
 
     class MockConfig:
         def __init__(self, port, host, sslkey=None, sslcert=None):
@@ -14,28 +14,40 @@ class AppFactoryTest(unittest.TestCase):
             self.sslcert = sslcert
             self.home = 'leap_home'
 
-    @patch('pixelated.config.app_factory.init_app')
-    @patch('pixelated.config.app_factory.reactor')
-    @unittest.skip("refactoring startup, need to define a better place to put this")
-    def test_that_create_app_binds_to_tcp_port_if_no_ssl_options(self, reactor_mock, init_app_mock):
+    @patch('pixelated.application.reactor')
+    @patch('pixelated.application.Services')
+    def test_that_create_app_binds_to_tcp_port_if_no_ssl_options(self, services_mock, reactor_mock):
         app_mock = MagicMock()
         leap_session = MagicMock()
-        config = AppFactoryTest.MockConfig(12345, '127.0.0.1', leap_session)
+        config = ApplicationTest.MockConfig(12345, '127.0.0.1', leap_session)
 
-        create_app(config.home, leap_session, config.host, config.port, config.sslkey, config.sslcert)
+        d = pixelated.application.start_user_agent(app_mock, config.host, config.port, config.sslkey, config.sslcert, config.home, leap_session)
 
-        reactor_mock.listenTCP.assert_called_once_with(12345, ANY, interface='127.0.0.1')
+        def _assert(_):
+            services_mock.assert_called_once_with(config.home, leap_session)
 
-    @patch('pixelated.config.app_factory.init_app')
-    @patch('pixelated.config.app_factory.reactor')
-    @unittest.skip("refactoring startup, need to define a better place to put this")
-    def test_that_create_app_binds_to_ssl_if_ssl_options(self, reactor_mock, init_app_mock):
+            reactor_mock.listenTCP.assert_called_once_with(12345, ANY, interface='127.0.0.1')
+            app_mock.stopListening.assert_called()
+
+        d.addCallback(_assert)
+        return d
+
+    @patch('pixelated.application.reactor')
+    @patch('pixelated.application.Services')
+    def test_that_create_app_binds_to_ssl_if_ssl_options(self, services_mock, reactor_mock):
         app_mock = MagicMock()
         leap_session = MagicMock()
-        pixelated.config.app_factory._ssl_options = lambda x, y: 'options'
+        pixelated.application._ssl_options = lambda x, y: 'options'
+
+        config = ApplicationTest.MockConfig(12345, '127.0.0.1', sslkey="sslkey", sslcert="sslcert")
+
+        d = pixelated.application.start_user_agent(app_mock, config.host, config.port, config.sslkey, config.sslcert, config.home, leap_session)
 
-        config = AppFactoryTest.MockConfig(12345, '127.0.0.1', sslkey="sslkey", sslcert="sslcert")
+        def _assert(_):
+            services_mock.assert_called_once_with(config.home, leap_session)
 
-        create_app(config.home, leap_session, config.host, config.port, config.sslkey, config.sslcert)
+            reactor_mock.listenSSL.assert_called_once_with(12345, ANY, 'options', interface='127.0.0.1')
+            app_mock.stopListening.assert_called()
 
-        reactor_mock.listenSSL.assert_called_once_with(12345, ANY, 'options', interface='127.0.0.1')
+        d.addCallback(_assert)
+        return d