summaryrefslogtreecommitdiff
path: root/tests/test_scripts
diff options
context:
space:
mode:
authorEric Atkin <eatkin@certusllc.us>2019-02-15 15:59:13 -0700
committerMichael Merickel <michael@merickel.org>2019-03-21 22:24:36 -0500
commitc380d0226fdc5ade67f10dadc1adabdc6e50cb70 (patch)
tree527dd3a1ce0b117c6277c184759edd4457b4793d /tests/test_scripts
parenteda95b5105ec8050a97e34ad76bea35cc8f8fb7b (diff)
downloadpyramid-c380d0226fdc5ade67f10dadc1adabdc6e50cb70.tar.gz
pyramid-c380d0226fdc5ade67f10dadc1adabdc6e50cb70.tar.bz2
pyramid-c380d0226fdc5ade67f10dadc1adabdc6e50cb70.zip
Add ignore_files to pserve configuration section
Diffstat (limited to 'tests/test_scripts')
-rw-r--r--tests/test_scripts/test_pserve.py32
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(),
},
)