diff options
| -rw-r--r-- | pyramid/scripts/pserve.py | 11 | ||||
| -rw-r--r-- | pyramid/tests/test_scripts/test_pserve.py | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index 89bfc765f..cc368d721 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -45,8 +45,8 @@ if WIN and not hasattr(os, 'kill'): # pragma: no cover else: kill = os.kill -def main(argv=sys.argv): - command = PServeCommand(argv) +def main(argv=sys.argv, quiet=False): + command = PServeCommand(argv, quiet=quiet) return command.run() class DaemonizeException(Exception): @@ -165,11 +165,14 @@ class PServeCommand(object): possible_subcommands = ('start', 'stop', 'restart', 'status') - def __init__(self, argv): + def __init__(self, argv, quiet=False): self.options, self.args = self.parser.parse_args(argv[1:]) + if quiet: + self.options.verbose = 0 def out(self, msg): # pragma: no cover - print(msg) + if self.options.verbose > 0: + print(msg) def get_options(self): if (len(self.args) > 1 diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py index 350487e2a..107ff4c0a 100644 --- a/pyramid/tests/test_scripts/test_pserve.py +++ b/pyramid/tests/test_scripts/test_pserve.py @@ -259,7 +259,7 @@ class Test_read_pidfile(unittest.TestCase): class Test_main(unittest.TestCase): def _callFUT(self, argv): from pyramid.scripts.pserve import main - return main(argv) + return main(argv, quiet=True) def test_it(self): result = self._callFUT(['pserve']) |