mirrors/debugpy
1
0
Fork 0
mirror of https://github.com/microsoft/debugpy.git synced 2025-12-23 08:48:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #925: Make --host a required switch

Browse source
This commit is contained in:
Pavel Minaev 2018-10-16 16:03:10 -07:00
parent cbb5a51c4b
commit bd220d0333
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ptvsd/__main__.py
View file

@ -157,7 +157,7 @@ def _parse_args(prog, argv):
parser.add_argument('--nodebug', action='store_true')
parser.add_argument('--client', action='store_true')
parser.add_argument('--host')
parser.add_argument('--host', required=True)
parser.add_argument('--port', type=int, required=True)
target = parser.add_mutually_exclusive_group(required=True)

45
tests/ptvsd/test___main__.py
View file

@ -9,22 +9,13 @@ class ParseArgsTests(unittest.TestCase):
EXPECTED_EXTRA = ['--']
def test_module(self):
args, extra = parse_args([
'eggs',
'--port', '8888',
'-m', 'spam',
])
self.assertEqual(vars(args), {
'kind': 'module',
'name': 'spam',
'address': Address.as_server(None, 8888),
'nodebug': False,
'single_session': False,
'wait': False,
})
self.assertEqual(extra, self.EXPECTED_EXTRA)
def test_host_required(self):
with self.assertRaises(SystemExit):
parse_args([
'eggs',
'--port', '8888',
'-m', 'spam',
])
def test_module_server(self):
args, extra = parse_args([
@ -49,6 +40,7 @@ class ParseArgsTests(unittest.TestCase):
'eggs',
'--nodebug',
'--client',
'--host', 'localhost',
'--port', '8888',
'-m', 'spam',
])
@ -56,7 +48,7 @@ class ParseArgsTests(unittest.TestCase):
self.assertEqual(vars(args), {
'kind': 'module',
'name': 'spam',
'address': Address.as_client(None, 8888),
'address': Address.as_client('localhost', 8888),
'nodebug': True,
'single_session': False,
'wait': False,
@ -66,6 +58,7 @@ class ParseArgsTests(unittest.TestCase):
def test_script(self):
args, extra = parse_args([
'eggs',
'--host', 'localhost',
'--port', '8888',
'spam.py',
])
@ -73,7 +66,7 @@ class ParseArgsTests(unittest.TestCase):
self.assertEqual(vars(args), {
'kind': 'script',
'name': 'spam.py',
'address': Address.as_server(None, 8888),
'address': Address.as_server('localhost', 8888),
'nodebug': False,
'single_session': False,
'wait': False,
@ -103,6 +96,7 @@ class ParseArgsTests(unittest.TestCase):
'eggs',
'--nodebug',
'--client',
'--host', 'localhost',
'--port', '8888',
'spam.py',
])
@ -110,7 +104,7 @@ class ParseArgsTests(unittest.TestCase):
self.assertEqual(vars(args), {
'kind': 'script',
'name': 'spam.py',
'address': Address.as_client(None, 8888),
'address': Address.as_client('localhost', 8888),
'nodebug': True,
'single_session': False,
'wait': False,
@ -179,6 +173,7 @@ class ParseArgsTests(unittest.TestCase):
args, extra = parse_args([
'eggs',
'--single-session',
'--host', 'localhost',
'--port', '8888',
'spam.py',
])
@ -236,6 +231,7 @@ class ParseArgsTests(unittest.TestCase):
args, extra = parse_args([
'eggs',
'--DEBUG',
'--host', 'localhost',
'--port', '8888',
'--vm_type', '???',
'spam.py',
@ -251,7 +247,7 @@ class ParseArgsTests(unittest.TestCase):
self.assertEqual(vars(args), {
'kind': 'script',
'name': 'spam.py',
'address': Address.as_server(None, 8888),
'address': Address.as_server('localhost', 8888),
'nodebug': False,
'single_session': False,
'wait': False,
@ -274,6 +270,7 @@ class ParseArgsTests(unittest.TestCase):
'--DEBUG',
'--nodebug',
'--client',
'--host', 'localhost',
'--port', '8888',
'--vm_type', '???',
'spam.py',
@ -289,7 +286,7 @@ class ParseArgsTests(unittest.TestCase):
self.assertEqual(vars(args), {
'kind': 'script',
'name': 'spam.py',
'address': Address.as_client(None, 8888),
'address': Address.as_client('localhost', 8888),
'nodebug': True,
'single_session': False,
'wait': False,
@ -337,6 +334,7 @@ class ParseArgsTests(unittest.TestCase):
def test_pseudo_backward_compatibility(self):
args, extra = parse_args([
'eggs',
'--host', 'localhost',
'--port', '8888',
'--module',
'--file', 'spam',
@ -345,7 +343,7 @@ class ParseArgsTests(unittest.TestCase):
self.assertEqual(vars(args), {
'kind': 'script',
'name': 'spam',
'address': Address.as_server(None, 8888),
'address': Address.as_server('localhost', 8888),
'nodebug': False,
'single_session': False,
'wait': False,
@ -357,6 +355,7 @@ class ParseArgsTests(unittest.TestCase):
'eggs',
'--nodebug',
'--client',
'--host', 'localhost',
'--port', '8888',
'--module',
'--file', 'spam',
@ -365,7 +364,7 @@ class ParseArgsTests(unittest.TestCase):
self.assertEqual(vars(args), {
'kind': 'script',
'name': 'spam',
'address': Address.as_client(None, 8888),
'address': Address.as_client('localhost', 8888),
'nodebug': True,
'single_session': False,
'wait': False,

1
tests/system_tests/test_connection.py
View file

@ -115,6 +115,7 @@ class RawConnectionTests(unittest.TestCase):
proc = Proc.start_python_module('ptvsd', [
'--server',
'--wait',
'--host', 'localhost',
'--port', '5678',
'--file', filename,
], env={