Merge pull request #3735 from adroullier/script_info

Adding script name to 'global_config' during application setup 

3 files changed, 12 insertions, 2 deletions

diff --git a/tests/test_paster.py b/tests/test_paster.py
index 09e3bb868..e787e6973 100644
--- a/tests/test_paster.py
+++ b/tests/test_paster.py
@@ -159,6 +159,7 @@ class Test_bootstrap(unittest.TestCase):
         result = self._callFUT('/foo/bar/myapp.ini', request)
         self.assertEqual(result['app'], self.app)
         self.assertEqual(result['root'], self.root)
+        self.assertEqual(self.get_app.kw['options']['__script__'], 'bootstrap')
         self.assertTrue('closer' in result)
 
 
diff --git a/tests/test_scripts/test_prequest.py b/tests/test_scripts/test_prequest.py
index 2214f6350..4ff6cb34c 100644
--- a/tests/test_scripts/test_prequest.py
+++ b/tests/test_scripts/test_prequest.py
@@ -234,10 +234,17 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._out, [b'abc'])
 
     def test_command_method_configures_logging(self):
-        command = self._makeOne(['', 'development.ini', '/'])
+        command = self._makeOne(['', '--method=GET', 'development.ini', '/'])
         command.run()
         self.assertEqual(self.loader.calls[0]['op'], 'logging')
 
+    def test_command_script_name(self):
+        command = self._makeOne(['', '--method=GET', 'development.ini', '/'])
+        command.run()
+        self.assertEqual(
+            self.loader.calls[0]['defaults']['__script__'], 'prequest'
+        )
+
 
 class Test_main(unittest.TestCase):
     def _callFUT(self, argv):
diff --git a/tests/test_scripts/test_pserve.py b/tests/test_scripts/test_pserve.py
index 5e5c28c7b..a56f25597 100644
--- a/tests/test_scripts/test_pserve.py
+++ b/tests/test_scripts/test_pserve.py
@@ -47,7 +47,9 @@ class TestPServeCommand(unittest.TestCase):
         self.loader.server = lambda x: x
 
         inst.run()
-        self.assertEqual(app.global_conf, {'a': '1', 'b': '2'})
+        self.assertEqual(
+            app.global_conf, {'a': '1', 'b': '2', '__script__': 'pserve'}
+        )
 
     def test_original_ignore_files(self):
         msg = 'A change to "ignore_files" was detected'