diff options
| author | Stéphane Wirtel <stephane@wirtel.be> | 2018-10-17 11:51:28 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-10-17 11:51:28 (GMT) |
| commit | 6e57382464101d2669a425622e19fff57586b2ff (patch) | |
| tree | dd4d25911c8078381b33463401bbbef6cb68c776 | |
| parent | f82c9f1e1af8d35056a6961281d72467b4c46b8d (diff) | |
| download | cpython-6e57382464101d2669a425622e19fff57586b2ff.zip cpython-6e57382464101d2669a425622e19fff57586b2ff.tar.gz cpython-6e57382464101d2669a425622e19fff57586b2ff.tar.bz2 | |
[2.7] bpo-23420: Verify the value of '-s' when execute the CLI of cProfile (GH-9925) (GH-9928)
Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert
Kuska.
Co-authored-by: Robert Kuska <rkuska@gmail.com>
(cherry picked from commit fcd5e84a515e19409840c570730f0728e9fcfc83)
https://bugs.python.org/issue23420
| -rwxr-xr-x | Lib/cProfile.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_cprofile.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Lib/cProfile.py b/Lib/cProfile.py index d377094..cd53cc0 100755 --- a/Lib/cProfile.py +++ b/Lib/cProfile.py @@ -161,7 +161,7 @@ def label(code): # ____________________________________________________________ def main(): - import os, sys + import os, sys, pstats from optparse import OptionParser usage = "cProfile.py [-o output_file_path] [-s sort] scriptfile [arg] ..." parser = OptionParser(usage=usage) @@ -170,7 +170,8 @@ def main(): help="Save stats to <outfile>", default=None) parser.add_option('-s', '--sort', dest="sort", help="Sort order when printing to stdout, based on pstats.Stats class", - default=-1) + default=-1, + choices=sorted(pstats.Stats.sort_arg_dict_default)) if not sys.argv[1:]: parser.print_usage() diff --git a/Lib/test/test_cprofile.py b/Lib/test/test_cprofile.py index af3fe62..83d5229 100644 --- a/Lib/test/test_cprofile.py +++ b/Lib/test/test_cprofile.py @@ -1,7 +1,9 @@ """Test suite for the cProfile module.""" import sys +import unittest from test.test_support import run_unittest, TESTFN, unlink +from test.support.script_helper import assert_python_failure # rip off all interesting stuff from test_profile import cProfile @@ -26,8 +28,14 @@ class CProfileTest(ProfileTest): unlink(TESTFN) +class TestCommandLine(unittest.TestCase): + def test_sort(self): + rc, out, err = assert_python_failure('-m', 'cProfile', '-s', 'demo') + self.assertGreater(rc, 0) + self.assertIn(b"option -s: invalid choice: 'demo'", err) + def test_main(): - run_unittest(CProfileTest) + run_unittest(CProfileTest, TestCommandLine) def main(): if '-r' not in sys.argv: diff --git a/Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst b/Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst new file mode 100644 index 0000000..034e7e5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst @@ -0,0 +1,2 @@ +Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert +Kuska |