Skip to content

Commit

Permalink
Merge 2364058 into d9f9085
Browse files Browse the repository at this point in the history
  • Loading branch information
fenekku committed Oct 8, 2018
2 parents d9f9085 + 2364058 commit 2733294
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 5 additions & 1 deletion pytest_invenio/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#
# This file is part of pytest-invenio.
# Copyright (C) 2017-2018 CERN.
# Copyright (C) 2018 Northwestern University, Feinberg School of Medicine,
# Galter Health Sciences Library.
#
# pytest-invenio is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand Down Expand Up @@ -52,7 +54,9 @@ def pytest_generate_tests(metafunc):

# Parameterize test based on list of browsers.
browsers = os.environ.get('E2E_WEBDRIVER_BROWSERS', 'Chrome').split()
metafunc.parametrize('browser', browsers, indirect=True)
metafunc.parametrize(
'browser', browsers, indirect=True, scope='function'
)


@pytest.hookimpl(tryfirst=True, hookwrapper=True)
Expand Down
6 changes: 4 additions & 2 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#
# This file is part of pytest-invenio.
# Copyright (C) 2017-2018 CERN.
# Copyright (C) 2018 Northwestern University, Feinberg School of Medicine,
$ Galter Health Sciences Library.
#
# pytest-invenio is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand All @@ -15,6 +17,6 @@ check-manifest --ignore ".travis-*" && \
sphinx-build -qnNW docs docs/_build/html && \
# Following is needed in order to get proper code coverage for pytest plugins.
# See https://pytest-cov.readthedocs.io/en/latest/plugins.html
COV_CORE_SOURCE=pytest_invenio COV_CORE_CONFIG=.coveragerc COV_CORE_DATAFILE=.coverage.eager py.test --cov=pytest_invenio
COV_CORE_SOURCE=pytest_invenio COV_CORE_CONFIG=.coveragerc COV_CORE_DATAFILE=.coverage.eager pytest --cov=pytest_invenio
# Run twice to get proper test coverage results
COV_CORE_SOURCE=pytest_invenio COV_CORE_CONFIG=.coveragerc COV_CORE_DATAFILE=.coverage.eager py.test --cov=pytest_invenio
COV_CORE_SOURCE=pytest_invenio COV_CORE_CONFIG=.coveragerc COV_CORE_DATAFILE=.coverage.eager pytest --cov=pytest_invenio
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# This file is part of pytest-invenio.
# Copyright (C) 2017-2018 CERN.
# Copyright (C) 2018 Esteban J. G. Garbancho.
# Copyright (C) 2018 Northwestern University, Feinberg School of Medicine,
# Galter Health Sciences Library.
#
# pytest-invenio is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand Down Expand Up @@ -49,7 +51,7 @@

install_requires = [
'pytest-flask>=0.10.0',
'pytest>=3.8.0',
'pytest>=3.8.1',
'selenium>=3.7.0',
]

Expand Down

0 comments on commit 2733294

Please sign in to comment.