diff options
| -rw-r--r-- | conftest.py | 52 | ||||
| -rw-r--r-- | lib/spack/spack/cmd/test.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/conftest.py | 26 | ||||
| -rw-r--r-- | lib/spack/spack/test/pytest.ini (renamed from pytest.ini) | 2 |
4 files changed, 28 insertions, 54 deletions
diff --git a/conftest.py b/conftest.py deleted file mode 100644 index 6374a387c8..0000000000 --- a/conftest.py +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## - -import pytest - - -# Hooks to add command line options or set other custom behaviors. -# They must be placed here to be found by pytest. See: -# -# https://docs.pytest.org/en/latest/writing_plugins.html -# -def pytest_addoption(parser): - group = parser.getgroup("Spack specific command line options") - group.addoption( - '--fast', action='store_true', default=False, - help='runs only "fast" unit tests, instead of the whole suite') - - -def pytest_collection_modifyitems(config, items): - if not config.getoption('--fast'): - # --fast not given, run all the tests - return - - slow_tests = ['db', 'network', 'maybeslow'] - skip_as_slow = pytest.mark.skip( - reason='skipped slow test [--fast command line option given]' - ) - for item in items: - if any(x in item.keywords for x in slow_tests): - item.add_marker(skip_as_slow) diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 9d4d9e6bc8..bc93981374 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -97,7 +97,7 @@ def test(parser, args, unknown_args): return # pytest.ini lives in the root of the spack repository. - with working_dir(spack.paths.prefix): + with working_dir(spack.paths.test_path): # --list and --long-list print the test output better. if args.list or args.long_list: do_list(args, unknown_args) diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 71c4a95446..6649fa6a5e 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -53,6 +53,32 @@ from spack.spec import Spec from spack.version import Version +# Hooks to add command line options or set other custom behaviors. +# They must be placed here to be found by pytest. See: +# +# https://docs.pytest.org/en/latest/writing_plugins.html +# +def pytest_addoption(parser): + group = parser.getgroup("Spack specific command line options") + group.addoption( + '--fast', action='store_true', default=False, + help='runs only "fast" unit tests, instead of the whole suite') + + +def pytest_collection_modifyitems(config, items): + if not config.getoption('--fast'): + # --fast not given, run all the tests + return + + slow_tests = ['db', 'network', 'maybeslow'] + skip_as_slow = pytest.mark.skip( + reason='skipped slow test [--fast command line option given]' + ) + for item in items: + if any(x in item.keywords for x in slow_tests): + item.add_marker(skip_as_slow) + + # # These fixtures are applied to all tests # diff --git a/pytest.ini b/lib/spack/spack/test/pytest.ini index e8f5e33c71..ccad5f86cc 100644 --- a/pytest.ini +++ b/lib/spack/spack/test/pytest.ini @@ -1,7 +1,7 @@ # content of pytest.ini [pytest] addopts = --durations=20 -ra -testpaths = lib/spack/spack/test +testpaths = . python_files = *.py markers = db: tests that require creating a DB |