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

Merge pull request #1523 from MengJueM/master

This commit is contained in:
Ronny Pfannschmidt 2016-04-20 16:55:31 +02:00
parent a986b8f945 f51c34ef31
commit 6d661ace0a
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -87,3 +87,4 @@ Russel Winder
Ben Webb Ben Webb
Alexei Kozlenok Alexei Kozlenok
Cal Leeming Cal Leeming
Feng Ma

3
CHANGELOG.rst
View File

@ -5,7 +5,8 @@
* *
* * Fix win32 path issue when puttinging custom config file with absolute path
in ``pytest.main("-c your_absolute_path")``.
* Fix maximum recursion depth detection when raised error class is not aware * Fix maximum recursion depth detection when raised error class is not aware
of unicode/encoded bytes. of unicode/encoded bytes.

2
_pytest/config.py
View File

@ -104,7 +104,7 @@ def _prepareconfig(args=None, plugins=None):
elif not isinstance(args, (tuple, list)): elif not isinstance(args, (tuple, list)):
if not isinstance(args, str): if not isinstance(args, str):
raise ValueError("not a string or argument list: %r" % (args,)) raise ValueError("not a string or argument list: %r" % (args,))
args = shlex.split(args) args = shlex.split(args, posix=sys.platform == "win32")
config = get_config() config = get_config()
pluginmanager = config.pluginmanager pluginmanager = config.pluginmanager
try: try:

10
testing/test_config.py
View File

@ -101,6 +101,16 @@ class TestConfigCmdlineParsing:
config = testdir.parseconfig("-c", "custom.cfg") config = testdir.parseconfig("-c", "custom.cfg")
assert config.getini("custom") == "1" assert config.getini("custom") == "1"
def test_absolute_win32_path(self, testdir):
temp_cfg_file = testdir.makefile(".cfg", custom="""
[pytest]
addopts = --version
""")
from os.path import normpath
temp_cfg_file = normpath(str(temp_cfg_file))
ret = pytest.main("-c " + temp_cfg_file)
assert ret == _pytest.main.EXIT_OK
class TestConfigAPI: class TestConfigAPI:
def test_config_trace(self, testdir): def test_config_trace(self, testdir):
config = testdir.parseconfig() config = testdir.parseconfig()