tear out irrelevant test code, fix pcreate validation to test for output_directory

2 files changed, 1 insertions, 40 deletions

diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index 278727308..076b727a2 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -198,7 +198,7 @@ https://github.com/Pylons/?q=cookiecutter
             self.out('')
             self.show_scaffolds()
             return False
-        if not self.args:
+        if not self.args.output_directory:
             self.out('You must provide a project name')
             return False
         available = [x.name for x in self.scaffolds]
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py
index d6e6814fa..0286614ce 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/pyramid/tests/test_scripts/test_pcreate.py
@@ -1,32 +1,6 @@
-from contextlib import contextmanager
 import unittest
 
 
-@contextmanager
-def patch_argparser(parser):
-    result = {}
-    old_exit = parser.exit
-    old_error = parser.error
-    try:
-        def dummy_exit(status=0, message=None):
-            result['status'] = status
-            result['message'] = message
-            raise ArgumentParserExit
-
-        def dummy_error(message):
-            result['message'] = message
-
-        parser.exit = dummy_exit
-        parser.error = dummy_error
-        yield result
-    finally:
-        parser.exit = old_exit
-        parser.error = old_error
-
-class ArgumentParserExit(Exception):
-    pass
-
-
 class TestPCreateCommand(unittest.TestCase):
     def setUp(self):
         from pyramid.compat import NativeIO
@@ -75,19 +49,6 @@ class TestPCreateCommand(unittest.TestCase):
         self.assertTrue(out.count(
             'You must provide at least one scaffold name'))
 
-    def test_test_no_project_name(self):
-        cmd = self._makeOne('-s', 'dummy')
-        with patch_argparser(cmd.parser) as result:
-            try:
-                cmd.run()
-            except ArgumentParserExit:
-                self.assertEqual(result['status'], 2)
-                self.assertTrue(result['message'].startswith(
-                    'usage: pcreate [-h] [-s SCAFFOLD_NAME] [-t SCAFFOLD_NAME] [-l]'
-                ))
-            else:  # pragma: no cover
-                raise AssertionError
-
     def test_no_project_name(self):
         cmd = self._makeOne('-s', 'dummy')
         result = cmd.run()