From b2a749b34c1140613b3deaa2b55ab6c29dd343cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= Date: Mon, 20 Feb 2017 11:31:38 +0100 Subject: Add test. --- pyramid/tests/test_scripts/test_pserve.py | 20 +++++++++++++++++++- setup.py | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py index 18b0c84b6..f681eaedb 100644 --- a/pyramid/tests/test_scripts/test_pserve.py +++ b/pyramid/tests/test_scripts/test_pserve.py @@ -1,9 +1,11 @@ +import mock import os import unittest from pyramid.tests.test_scripts import dummy here = os.path.abspath(os.path.dirname(__file__)) + class TestPServeCommand(unittest.TestCase): def setUp(self): from pyramid.compat import NativeIO @@ -48,10 +50,11 @@ class TestPServeCommand(unittest.TestCase): inst.loadserver = self._get_server app = dummy.DummyApp() + def get_app(*args, **kwargs): app.global_conf = kwargs.get('global_conf', None) - inst.loadapp = get_app + inst.loadapp = get_app inst.run() self.assertEqual(app.global_conf, {'a': '1', 'b': '2'}) @@ -77,6 +80,21 @@ class TestPServeCommand(unittest.TestCase): os.path.abspath(os.path.join(here, '*.py')), ]) + def test_reload_call_hupper_with_correct_args(self): + with mock.patch('pyramid.scripts.pserve.hupper') as hupper_mock: + hupper_mock.is_active.side_effect = [False, True] + inst = self._makeOne('--reload', 'development.ini') + inst.loadserver = mock.MagicMock() + inst.loadapp = mock.MagicMock() + inst.run() + hupper_mock.start_reloader.assert_called_with( + 'pyramid.scripts.pserve.main', + reload_interval=1, + verbose=1, + worker_kwargs={'argv': ['pserve', '--reload', 'development.ini'], + 'quiet': False}) + + class Test_main(unittest.TestCase): def _callFUT(self, argv): from pyramid.scripts.pserve import main diff --git a/setup.py b/setup.py index d9fcec4c8..bd0e7f4d7 100644 --- a/setup.py +++ b/setup.py @@ -65,9 +65,10 @@ docs_extras = [ ] testing_extras = tests_require + [ + 'mock', 'nose', 'coverage', - 'virtualenv', # for scaffolding tests + 'virtualenv', # for scaffolding tests ] setup(name='pyramid', -- cgit v1.2.3