p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
holger krekel 2013-10-02 07:49:11 +02:00
parent c62bfaefd6 8f65418d34
commit 2ba77cb1f4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/_argcomplete.py
View File

@ -74,9 +74,13 @@ class FastFilesCompleter:
else: else:
prefix_dir = 0 prefix_dir = 0
completion = [] completion = []
globbed = []
if '*' not in prefix and '?' not in prefix: if '*' not in prefix and '?' not in prefix:
if prefix[-1] == os.path.sep: # we are on unix, otherwise no bash
globbed.extend(glob(prefix + '.*'))
prefix += '*' prefix += '*'
for x in sorted(glob(prefix)): globbed.extend(glob(prefix))
for x in sorted(globbed):
if os.path.isdir(x): if os.path.isdir(x):
x += '/' x += '/'
# append stripping the prefix (like bash, not like compgen) # append stripping the prefix (like bash, not like compgen)

4
doc/en/skipping.txt
View File

@ -183,7 +183,7 @@ Skip/xfail with parametrize
--------------------------- ---------------------------
It is possible to apply markers like skip and xfail to individual It is possible to apply markers like skip and xfail to individual
test instances when using parametrize: test instances when using parametrize::
import pytest import pytest
@ -191,7 +191,7 @@ test instances when using parametrize:
(1, 2), (1, 2),
pytest.mark.xfail((1, 0)), pytest.mark.xfail((1, 0)),
pytest.mark.xfail(reason="some bug")((1, 3)), pytest.mark.xfail(reason="some bug")((1, 3)),
(2, 3), (2, 3),
(3, 4), (3, 4),
(4, 5), (4, 5),
pytest.mark.skipif("sys.version_info >= (3,0)")((10, 11)), pytest.mark.skipif("sys.version_info >= (3,0)")((10, 11)),