Skip to content

Commit 3f16347

Browse files
authored
Merge pull request #15 from Zac-HD/emancipate
pytest-xdist compatibility fix
2 parents 32ed5aa + 95aa210 commit 3f16347

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGES.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Release Notes
77

88
* Thanks to `@boxed <https://github.com/boxed>`_ for the PR
99

10+
* Fixed compatibility with ``pytest-xdist`` 2.0+ (supporting >= 1.22.3)
11+
12+
* Thanks to `@Zac-HD <https://github.com/Zac-HD>`_ for the PR
13+
1014
**1.4.1 (2017-06-22)**
1115

1216
* Update dependency of requests to require v2.9 or later.

pytest_base_url/plugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def _verify_url(request, base_url):
3434

3535

3636
def pytest_configure(config):
37-
if hasattr(config, "slaveinput"):
38-
return # xdist slave
37+
if hasattr(config, "workerinput"):
38+
return # don't run configure on xdist worker nodes
3939
base_url = config.getoption("base_url") or config.getini("base_url")
4040
if base_url is not None:
4141
config.option.base_url = base_url

0 commit comments

Comments
 (0)