aselimov/pubs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into version

Browse Source
This commit is contained in:
Olivier Mangin 2018-04-03 12:36:52 -04:00 committed by GitHub
commit 50a44d964c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pubs/pubs_cmd.py
View File

@ -87,7 +87,7 @@ def execute(raw_args=sys.argv):
# Parse and run appropriate command # Parse and run appropriate command
# if no command, print help and exit peacefully (as '--help' does) # if no command, print help and exit peacefully (as '--help' does)
args = parser.parse_args(remaining_args) args = parser.parse_args(remaining_args)
if not args.command: if not args.command:
ui.error("Too few arguments!\n") ui.error("Too few arguments!\n")
parser.print_help(file=sys.stderr) parser.print_help(file=sys.stderr)

17
tests/test_usecase.py
View File

@ -39,11 +39,10 @@ class FakeSystemExit(Exception):
Added explicit __init__ so SystemExit.code functionality could be emulated. Added explicit __init__ so SystemExit.code functionality could be emulated.
Taking form from https://stackoverflow.com/a/26938914/1634191 Taking form from https://stackoverflow.com/a/26938914/1634191
""" """
def __init__(self, message, code=None, *args): def __init__(self, code=None, *args):
self.message = message
self.code = code self.code = code
super(FakeSystemExit, self).__init__(
super(FakeSystemExit, self).__init__(message, *args) "Exited with code: {}.".format(self.code), *args)
# code for fake fs # code for fake fs
@ -202,7 +201,6 @@ class TestAlone(CommandTestCase):
self.assertEqual(cm.exception.code, 2) self.assertEqual(cm.exception.code, 2)
@unittest.skipIf(sys.version_info.major == 2, "not supported for Python2")
def test_alone_prints_help(self): def test_alone_prints_help(self):
# capturing the output of `pubs --help` is difficult because argparse # capturing the output of `pubs --help` is difficult because argparse
# raises as SystemExit(0) after calling `print_help`, and this gets # raises as SystemExit(0) after calling `print_help`, and this gets
@ -210,14 +208,15 @@ class TestAlone(CommandTestCase):
# `pubs --help` isn't too easy unless substantially reorganization of # `pubs --help` isn't too easy unless substantially reorganization of
# the parser and testing context is made. instead, the exit codes of # the parser and testing context is made. instead, the exit codes of
# the two usecases are compared. # the two usecases are compared.
with self.assertRaises(FakeSystemExit) as cm1: with self.assertRaises(FakeSystemExit) as cm1:
self.execute_cmds(['pubs']) self.execute_cmds(['pubs'])
self.assertEqual(cm1.exception.code, 2)
def test_help_prints_help(self):
# see test_alone_prints_help
with self.assertRaises(FakeSystemExit) as cm2: with self.assertRaises(FakeSystemExit) as cm2:
self.execute_cmds(['pubs', '--help']) self.execute_cmds(['pubs init', 'pubs --help'])
self.assertEqual(cm2.exception.code, 0)
self.assertEqual(cm1.exception.code, cm2.exception.code, 2)
class TestInit(CommandTestCase): class TestInit(CommandTestCase):