@@ -2,6 +2,7 @@
|
|||||||
-------
|
-------
|
||||||
|
|
||||||
- fix readme display on pypi
|
- fix readme display on pypi
|
||||||
|
- fix #22: xdist now works if the internal tmpdir plugin is disabled.
|
||||||
|
|
||||||
|
|
||||||
1.13.1
|
1.13.1
|
||||||
|
|||||||
@@ -522,6 +522,18 @@ def test_issue_594_random_parametrize(testdir):
|
|||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
def test_tmpdir_disabled(testdir):
|
||||||
|
"""Test xdist doesn't break if internal tmpdir plugin is disabled (#22).
|
||||||
|
"""
|
||||||
|
p1 = testdir.makepyfile("""
|
||||||
|
def test_ok():
|
||||||
|
pass
|
||||||
|
""")
|
||||||
|
result = testdir.runpytest(p1, "-n1", '-p', 'no:tmpdir')
|
||||||
|
assert result.ret == 0
|
||||||
|
result.stdout.fnmatch_lines("*1 passed*")
|
||||||
|
|
||||||
|
|
||||||
class TestNodeFailure:
|
class TestNodeFailure:
|
||||||
def test_load_single(self, testdir):
|
def test_load_single(self, testdir):
|
||||||
f = testdir.makepyfile("""
|
f = testdir.makepyfile("""
|
||||||
|
|||||||
@@ -228,6 +228,7 @@ class SlaveController(object):
|
|||||||
option_dict = vars(self.config.option)
|
option_dict = vars(self.config.option)
|
||||||
if spec.popen:
|
if spec.popen:
|
||||||
name = "popen-%s" % self.gateway.id
|
name = "popen-%s" % self.gateway.id
|
||||||
|
if hasattr(self.config, '_tmpdirhandler'):
|
||||||
basetemp = self.config._tmpdirhandler.getbasetemp()
|
basetemp = self.config._tmpdirhandler.getbasetemp()
|
||||||
option_dict['basetemp'] = str(basetemp.join(name))
|
option_dict['basetemp'] = str(basetemp.join(name))
|
||||||
self.config.hook.pytest_configure_node(node=self)
|
self.config.hook.pytest_configure_node(node=self)
|
||||||
|
|||||||
Reference in New Issue
Block a user