summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2017-03-06 12:38:45 -0500
committerGitHub <noreply@github.com>2017-03-06 12:38:45 -0500
commitc84081d84d39420d56d88d37d0e93e7cb473c430 (patch)
tree7c87947fe6da4131fe49da44a2da8bafdb46b3ca
parent6a002fb9641d2631038bba8d80e5467f312fa0db (diff)
parent62bfa9e44dca53d8dada6aa79f9c1482e31c4deb (diff)
downloadopenshift-c84081d84d39420d56d88d37d0e93e7cb473c430.tar.gz
openshift-c84081d84d39420d56d88d37d0e93e7cb473c430.tar.bz2
openshift-c84081d84d39420d56d88d37d0e93e7cb473c430.tar.xz
openshift-c84081d84d39420d56d88d37d0e93e7cb473c430.zip
Merge pull request #3566 from detiber/testConfigs
separate out test tool configs from setup.cfg
-rw-r--r--.flake84
-rw-r--r--.pylintrc2
-rw-r--r--pytest.ini18
-rw-r--r--setup.cfg27
4 files changed, 23 insertions, 28 deletions
diff --git a/.flake8 b/.flake8
new file mode 100644
index 000000000..98ddeef20
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,4 @@
+[flake8]
+exclude=.tox,utils,inventory
+max_line_length = 120
+ignore = E501,T003
diff --git a/.pylintrc b/.pylintrc
index fd6c6d0bd..e85987de3 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -60,7 +60,7 @@ confidence=
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
-#disable=
+disable=fixme,locally-disabled,file-ignored,duplicate-code
[REPORTS]
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 000000000..fec074f90
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,18 @@
+[pytest]
+norecursedirs =
+ .*
+ __pycache__
+ cover
+ docs
+ # utils has it's own config
+ utils
+python_files =
+ # TODO(rhcarvalho): rename test files to follow a single pattern. "test*.py"
+ # is Python unittest's default, while pytest discovers both "test_*.py" and
+ # "*_test.py" by default.
+ test_*.py
+ *_tests.py
+addopts =
+ --cov=.
+ --cov-report=term
+ --cov-report=html
diff --git a/setup.cfg b/setup.cfg
index e6bf2c5d1..f808fec5a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,30 +6,3 @@ universal=1
[yamllint]
excludes=.tox,utils,files
-
-[lint]
-lint_disable=fixme,locally-disabled,file-ignored,duplicate-code
-
-[flake8]
-exclude=.tox/*,utils/*,inventory/*
-max_line_length = 120
-ignore = E501,T003
-
-[tool:pytest]
-norecursedirs =
- .*
- __pycache__
- cover
- docs
- # utils have its own config
- utils
-python_files =
- # TODO(rhcarvalho): rename test files to follow a single pattern. "test*.py"
- # is Python unittest's default, while pytest discovers both "test_*.py" and
- # "*_test.py" by default.
- test_*.py
- *_tests.py
-addopts =
- --cov=.
- --cov-report=term
- --cov-report=html