From 820dafa741e149b3725cae33bc31542f66fb81b0 Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Thu, 25 Feb 2016 11:17:30 -0800 Subject: [PATCH 1/4] Change to session_capabilities, for pytest-sel 1.2.0 --- oneanddone/tests/functional/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oneanddone/tests/functional/conftest.py b/oneanddone/tests/functional/conftest.py index 29c55f5a..e082e41f 100644 --- a/oneanddone/tests/functional/conftest.py +++ b/oneanddone/tests/functional/conftest.py @@ -9,9 +9,9 @@ @pytest.fixture(scope='session') -def capabilities(capabilities): - capabilities.setdefault('tags', []).append('oneanddone') - return capabilities +def session_capabilities(session_capabilities): + session_capabilities.setdefault('tags', []).append('oneanddone') + return session_capabilities @pytest.fixture From 39f124f5ac5f1702049e4ad278b86ada9fa23115 Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Thu, 25 Feb 2016 11:18:32 -0800 Subject: [PATCH 2/4] Update to pytest-selenium-1.2.0rc1 --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index a7a57c63..b75466cb 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,6 +1,6 @@ bidpom pypom pytest==2.8.5 -pytest-selenium +pytest-selenium>=1.2.0rc1 pytest-xdist==1.13.1 requests==2.8.1 From 0d02d1120a37ca1f8aa42e90b7bd1e4fd924c75e Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Thu, 25 Feb 2016 11:26:53 -0800 Subject: [PATCH 3/4] Downgrading pytest to 2.7.3 to see it it helps --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index b75466cb..054d9a33 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,6 +1,6 @@ bidpom pypom -pytest==2.8.5 +pytest==2.7.3 pytest-selenium>=1.2.0rc1 pytest-xdist==1.13.1 requests==2.8.1 From 505bba3d690c22b26710793b407d69f5b332e71e Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Thu, 25 Feb 2016 11:48:06 -0800 Subject: [PATCH 4/4] Un-pin pytest-selenium, as 1.2.1 is now out --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index 054d9a33..60e12c89 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,6 +1,6 @@ bidpom pypom pytest==2.7.3 -pytest-selenium>=1.2.0rc1 +pytest-selenium pytest-xdist==1.13.1 requests==2.8.1