Skip to content

Commit

Permalink
Merge pull request #30 from fizyk/getfixturevalue
Browse files Browse the repository at this point in the history
replace usage of getfuncargvalue with getfixturevalue
  • Loading branch information
fizyk committed Oct 24, 2016
2 parents ed59eb5 + cb99d2b commit efe2235
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
unreleased
-------

- [feature] - migrate usage of getfuncargvalue to getfixturevalue. require at least pytest 3.0.0
- [feature] - default logsdir to $TMPDIR
- [feature] - run process on random port by default - enhances xdist experience

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def read(fname):
return open(os.path.join(here, fname)).read()

requirements = [
'pytest',
'pytest>=3.0.0',
'mirakuru',
'elasticsearch',
'path.py>=6.2',
Expand Down
2 changes: 1 addition & 1 deletion src/pytest_elasticsearch/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def elasticsearch(process_fixture_name):
@pytest.fixture
def elasticsearch_fixture(request):
"""Elasticsearch client fixture."""
process = request.getfuncargvalue(process_fixture_name)
process = request.getfixturevalue(process_fixture_name)
if not process.running():
process.start()

Expand Down
7 changes: 7 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
"""Tests main conftest file."""
import sys
import warnings

major, minor = sys.version_info[:2]

if not (major >= 3 and minor >= 5):
warnings.simplefilter("error", category=DeprecationWarning)

0 comments on commit efe2235

Please sign in to comment.