From baec2ab325c922d639729950898cf48c3dfbc03a Mon Sep 17 00:00:00 2001
From: Michael van Tellingen <m.vantellingen@lukkien.com>
Date: Sat, 24 Jan 2015 13:28:41 +0100
Subject: [PATCH] Make test configuration pytest compatible

---
 setup.cfg         | 3 +++
 tests/conftest.py | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 tests/conftest.py

diff --git a/setup.cfg b/setup.cfg
index 3c6e79cf31d..6c300d5a1cb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,5 @@
 [bdist_wheel]
 universal=1
+
+[pytest]
+python_files=test_*.py *tests.py
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 00000000000..e4e0b42fbdc
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,5 @@
+from config import configure
+
+
+def pytest_configure():
+    configure()