Merge branch 'master' into security-policy

1 files changed, 30 insertions, 2 deletions

diff --git a/tests/test_scripts/test_pserve.py b/tests/test_scripts/test_pserve.py
index a573f2e5b..f19ba81df 100644
--- a/tests/test_scripts/test_pserve.py
+++ b/tests/test_scripts/test_pserve.py
@@ -19,10 +19,10 @@ class TestPServeCommand(unittest.TestCase):
 
         return PServeCommand
 
-    def _makeOne(self, *args):
+    def _makeOne(self, *args, **kwargs):
         effargs = ['pserve']
         effargs.extend(args)
-        cmd = self._getTargetClass()(effargs)
+        cmd = self._getTargetClass()(effargs, **kwargs)
         cmd.out = self.out
         self.loader = dummy.DummyLoader()
         cmd._get_config_loader = self.loader
@@ -49,6 +49,32 @@ class TestPServeCommand(unittest.TestCase):
         inst.run()
         self.assertEqual(app.global_conf, {'a': '1', 'b': '2'})
 
+    def test_original_ignore_files(self):
+        msg = 'A change to "ignore_files" was detected'
+
+        def get_app(name, global_conf):
+            app.name = name
+            app.global_conf = global_conf
+            return app
+
+        inst = self._makeOne('development.ini')
+        app = dummy.DummyApp()
+        self.loader.get_wsgi_app = get_app
+        self.loader.server = lambda x: x
+        self.loader.settings = {'pserve': {'ignore_files': '*.txt'}}
+        inst.run()
+        self.assertNotIn(msg, self.out_.getvalue())
+
+        inst = self._makeOne(
+            'development.ini', original_ignore_files={'*.txt'}
+        )
+        app = dummy.DummyApp()
+        self.loader.get_wsgi_app = get_app
+        self.loader.server = lambda x: x
+        self.loader.settings = {'pserve': {'ignore_files': 'foo/*.txt'}}
+        inst.run()
+        self.assertIn(msg, self.out_.getvalue())
+
     def test_parse_vars_bad(self):
         inst = self._makeOne('development.ini', 'a')
         self.assertRaises(ValueError, inst.run)
@@ -122,7 +148,9 @@ class TestPServeCommand(unittest.TestCase):
                 'worker_kwargs': {
                     'argv': ['pserve', '--reload', 'development.ini'],
                     'quiet': False,
+                    'original_ignore_files': set(),
                 },
+                'ignore_files': set(),
             },
         )