Skip to content

Commit efc6ab8

Browse files
committed
Added argcomplete to unit test environment. Added exclusion for Windows
1 parent 6efe721 commit efc6ab8

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

cmd2/argcomplete_bridge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def tokens_for_completion(line, endidx):
7070
break
7171
except ValueError:
7272
# ValueError can be caused by missing closing quote
73-
if not quotes_to_try: # pragma: no cover
73+
if not quotes_to_try: # pragma: no cover
7474
# Since we have no more quotes to try, something else
7575
# is causing the parsing error. Return None since
7676
# this means the line is malformed.

tests/test_bashcompletion.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
from typing import List
1212

1313
from cmd2.argparse_completer import ACArgumentParser, AutoCompleter
14-
from cmd2.argcomplete_bridge import CompletionFinder
15-
14+
try:
15+
from cmd2.argcomplete_bridge import CompletionFinder
16+
except:
17+
# Don't test if argcomplete isn't present (likely on Windows)
18+
pytest.skip()
1619

1720
actors = ['Mark Hamill', 'Harrison Ford', 'Carrie Fisher', 'Alec Guinness', 'Peter Mayhew',
1821
'Anthony Daniels', 'Adam Driver', 'Daisy Ridley', 'John Boyega', 'Oscar Isaac',

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ deps =
1616
pytest
1717
pytest-cov
1818
pytest-mock
19+
argcomplete
1920
wcwidth
2021
commands =
2122
py.test {posargs} --cov
@@ -27,6 +28,7 @@ deps =
2728
pyperclip
2829
pytest
2930
pytest-mock
31+
argcomplete
3032
wcwidth
3133
commands = py.test -v
3234

@@ -35,7 +37,6 @@ deps =
3537
mock
3638
pyperclip
3739
pyreadline
38-
pytest-mock
3940
pytest
4041
commands = py.test -v
4142

@@ -46,6 +47,7 @@ deps =
4647
pytest
4748
pytest-cov
4849
pytest-mock
50+
argcomplete
4951
wcwidth
5052
commands =
5153
py.test {posargs} --cov
@@ -57,7 +59,6 @@ deps =
5759
pyperclip
5860
pyreadline
5961
pytest
60-
pytest-mock
6162
pytest-cov
6263
commands =
6364
py.test {posargs} --cov
@@ -68,6 +69,7 @@ deps =
6869
pyperclip
6970
pytest
7071
pytest-mock
72+
argcomplete
7173
wcwidth
7274
commands = py.test -v
7375

0 commit comments

Comments
 (0)