From 69e564fed4f7f29a17d820e8c2a6d76bef7cb187 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Mon, 10 Feb 2014 18:01:05 -0500 Subject: [PATCH] tests: check pep8 compliance via pytest-pep8 --- pytest.ini | 2 +- requirements.txt | 1 + setup.py | 2 +- starcluster/tests/conftest.py | 3 --- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pytest.ini b/pytest.ini index 24f4c5bfa..e3fa21aef 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,2 @@ [pytest] -addopts = starcluster +addopts = starcluster -xvs -rs --pep8 --clearcache diff --git a/requirements.txt b/requirements.txt index 97773ba22..0c2c1ea57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,5 +17,6 @@ pyflakes==0.7.3 watchdog==0.7.1 pytest==2.5.2 pytest-cov==1.6 +pytest-pep8==1.0.5 sphinx==1.2.1 pudb==2013.5.1 diff --git a/setup.py b/setup.py index 8210192d6..7c37f48fb 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ def run_tests(self): console_scripts = ['starcluster = starcluster.cli:main'] extra = dict(test_suite="starcluster.tests", - tests_require=["pytest", "pytest-cov"], + tests_require=["pytest", "pytest-cov", "pytest-pep8"], cmdclass={"test": PyTest}, install_requires=["paramiko>=1.12.1", "boto>=2.23.0", "workerpool>=0.9.2", "Jinja2>=2.7", diff --git a/starcluster/tests/conftest.py b/starcluster/tests/conftest.py index 3b8380a91..f21631a07 100644 --- a/starcluster/tests/conftest.py +++ b/starcluster/tests/conftest.py @@ -14,9 +14,6 @@ def pytest_runtest_setup(item): def pytest_configure(config): - config.option.exitfirst = True - config.option.verbose = True - config.option.capture = 'no' if config.getoption("--coverage"): config.option.cov_source = ['starcluster'] config.option.cov_report = ['term-missing']