Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Update integration test dependencies" #3903

Merged
merged 1 commit into from
Feb 25, 2016
Merged

Revert "Update integration test dependencies" #3903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,32 @@ execnet==1.4.1
# sha256: plAZY8cl_CVU2r_s6K6aj7XhScCsCkL9KwLFwcV_wRQ
py==1.4.31

# sha256: M2Eu1t5C8FZA_gWKr98IiZ6ryyENp0rrC3iN6Wlci7U
# sha256: _EyGvlT84I5LhbZGpzbvoYxs3nWZwdKRn090Yp4Bi68
pytest==2.8.7
# sha256: 9RhVsnz3ewsvqsdcYwCHrntIz_IrK9v0tjumb1eQr5g
# sha256: RLsy-zkltaKEzu4a9V4KY9JUNuxBUjIIlAPu06NHZn4
pytest==2.8.5

# sha256: 0UWsncelV6cZq3l3C-CUEATh4DjhN8NFkZGdnfKnkLE
# sha256: 12-TTnf6Bz9IzFIZRaSZAKhZ5hD6Ap3YgNHYuZe3fCM
pytest-django==2.8.0

# sha256: zzI98ijiZdZ1XsOaJvKXGsxZoxsN4M_QJtNBJJ2-72k
# sha256: 3-epy0EWdBTKe56Fr71mlOjMg_2_V9DlRcIVwyzUDNY
pytest-html==1.8.0
# sha256: KieLOTNuHzPoNbDJ2WvbzMMjR4LHNi3Lh9mHhnTlmeU
# sha256: 5j2bkYqs99tlgR6MsCop0xRR65TE4x5eVYKHqkAuC6o
pytest-html==1.7

# sha256: 6C8KJlsOI4rEKsJ115MT0KfgvvGkUGM66z1lScwU9Rc
# sha256: vSEhAi_zJVzoL67A7zYCRi7GvOnKYntTRimGz8mzkek
pytest-selenium==1.2.1
# sha256: NLWAzMp3g9WrHfdPd41Lial0AXZYWDoOeCZ-ZeNmZOs
# sha256: -1mbZYHCSGV39wD0SyuKmimYua2WslMNne37Z5ZqxF4
pytest-selenium==1.1

# sha256: naX4m9sivV9wDs8QeH8jkZC3gyqzRFvzI0PNTlFBaCU
# sha256: JRBWj6RpL-glun6_xu6zDSkJbNF3uijfKDdXFvbq38k
pytest-variables==1.3
# sha256: LNxLgU182xSv9s3gFouz7i__TyhDn4DmecDJjCdIgBI
pytest-variables==1.2

# sha256: ggVQp0DKH3RsOZoBAZhsDm-U-_48b5duP2lNtFLL4SQ
selenium==2.52.0
# sha256: mOu_nFRQbX43QvBHYsrUOmaoesX_BeGOtUiL6dJ0_BM
# sha256: O7IwsN40riapOxqE5ZIs3cdh9sYB_dcBFhaIRlTk2rE
selenium==2.49.2

# sha256: Sl4RmRIvop4wF9jRifWczF2C6EFHS6Kh7sDolgYVNiM
# sha256: BS-V3qAcz8dS-fSCiQi8bhbUEw_8QgtuExAZVUqZV9s
pytest-xdist==1.14
# sha256: Q4LXqUTB4rHcF_7j_TV1SV-xAjajtulcxpVdsEmEvDw
# sha256: 529Ztp_AzN6LlHcoSn-3JqJKIfX6rmqzBZOS6LvYiqc
pytest-xdist==1.13.1

# sha256: r69pKKOCTcZUPIJsGK8Z8bzkl-91lt_b-v_mVYwWq-Q
pytest-rerunfailures==1.0.1
# sha256: P7fn7BucO9euc0xq5XErmsAjE6NM7SJxcND2OKK4VKI
pytest-rerunfailures==0.05
6 changes: 3 additions & 3 deletions tests/functional/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@


@pytest.fixture(scope='session')
def session_capabilities(session_capabilities):
session_capabilities.setdefault('tags', []).append('bedrock')
return session_capabilities
def capabilities(capabilities):
capabilities.setdefault('tags', []).append('bedrock')
return capabilities


@pytest.fixture
Expand Down