# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
# Date 2015-05-14 21:05:47
# Node ID 08ad393e6866ee2a03e0dfadc853861f2ecf0ce2
# Parent  7187c1707eda75b1867e1d4b9a6a8f3c2a1eda8d

tests: move pytest settings from kallithea/tests/pytest.ini to setup.cfg

pytest.ini was added in 9b8ba0f1c87b but didn't work. pytest only uses one
configuration file and does not merge settings from multiple files [1]. The
first detected file is setup.cfg thus should contain all relevant
configuration.

[1] http://pytest.org/latest/customize.html#initialization-determining-rootdir-and-inifile

diff --git a/kallithea/tests/pytest.ini b/kallithea/tests/pytest.ini
deleted file mode 100644
--- a/kallithea/tests/pytest.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[pytest]
-addopts =
-    # --verbose
-    # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings.
-    -rfEsxXw
-    # Shorter scrollbacks; less stuff to scroll through
-    --tb=short
diff --git a/setup.cfg b/setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,6 +13,12 @@ nologcapture = 1
 [pytest]
 # only look for tests in kallithea/tests
 python_files = kallithea/tests/**/test_*.py
+addopts =
+    # --verbose
+    # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings.
+    -rfEsxXw
+    # Shorter scrollbacks; less stuff to scroll through
+    --tb=short
 
 [compile_catalog]
 domain = kallithea