summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2017-03-06 11:24:05 -0500
committerJason DeTiberus <jdetiber@redhat.com>2017-03-06 12:13:43 -0500
commit62bfa9e44dca53d8dada6aa79f9c1482e31c4deb (patch)
tree219d07ad6ac1d0d3865b4be6730f124b8a3ebaa3
parent354d4e41b4693bc055dfb0a8e302088e0b978408 (diff)
downloadopenshift-62bfa9e44dca53d8dada6aa79f9c1482e31c4deb.tar.gz
openshift-62bfa9e44dca53d8dada6aa79f9c1482e31c4deb.tar.bz2
openshift-62bfa9e44dca53d8dada6aa79f9c1482e31c4deb.tar.xz
openshift-62bfa9e44dca53d8dada6aa79f9c1482e31c4deb.zip
separate out test tool configs from setup.cfg
Since we are moving away from setuptools for invoking tests, lets move the configs for the different test tools into their own configs.
-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