From 57fa75679a721438094e4b4b046ceb34da0e68d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20M=C3=BCllegger?= <gregor@muellegger.de>
Date: Thu, 16 Jul 2015 10:03:20 +0200
Subject: [PATCH] Trying py.test as test runner

---
 pytest.ini                                     |  2 ++
 .../{deprecations.py => test_deprecations.py}  |  0
 tests/{fields.py => test_fields.py}            |  0
 tests/{forms.py => test_forms.py}              |  0
 tests/{gis.py => test_gis.py}                  |  0
 tests/{layouts.py => test_layouts.py}          |  0
 tests/{modelforms.py => test_modelforms.py}    |  0
 tests/{rendering.py => test_rendering.py}      |  0
 .../{templatetags.py => test_templatetags.py}  |  0
 tests/{widgets.py => test_widgets.py}          |  0
 tests/tests.py                                 | 18 +++++++++---------
 11 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 pytest.ini
 rename tests/{deprecations.py => test_deprecations.py} (100%)
 rename tests/{fields.py => test_fields.py} (100%)
 rename tests/{forms.py => test_forms.py} (100%)
 rename tests/{gis.py => test_gis.py} (100%)
 rename tests/{layouts.py => test_layouts.py} (100%)
 rename tests/{modelforms.py => test_modelforms.py} (100%)
 rename tests/{rendering.py => test_rendering.py} (100%)
 rename tests/{templatetags.py => test_templatetags.py} (100%)
 rename tests/{widgets.py => test_widgets.py} (100%)

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..929815d
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+DJANGO_SETTINGS_MODULE=tests.settings
diff --git a/tests/deprecations.py b/tests/test_deprecations.py
similarity index 100%
rename from tests/deprecations.py
rename to tests/test_deprecations.py
diff --git a/tests/fields.py b/tests/test_fields.py
similarity index 100%
rename from tests/fields.py
rename to tests/test_fields.py
diff --git a/tests/forms.py b/tests/test_forms.py
similarity index 100%
rename from tests/forms.py
rename to tests/test_forms.py
diff --git a/tests/gis.py b/tests/test_gis.py
similarity index 100%
rename from tests/gis.py
rename to tests/test_gis.py
diff --git a/tests/layouts.py b/tests/test_layouts.py
similarity index 100%
rename from tests/layouts.py
rename to tests/test_layouts.py
diff --git a/tests/modelforms.py b/tests/test_modelforms.py
similarity index 100%
rename from tests/modelforms.py
rename to tests/test_modelforms.py
diff --git a/tests/rendering.py b/tests/test_rendering.py
similarity index 100%
rename from tests/rendering.py
rename to tests/test_rendering.py
diff --git a/tests/templatetags.py b/tests/test_templatetags.py
similarity index 100%
rename from tests/templatetags.py
rename to tests/test_templatetags.py
diff --git a/tests/widgets.py b/tests/test_widgets.py
similarity index 100%
rename from tests/widgets.py
rename to tests/test_widgets.py
diff --git a/tests/tests.py b/tests/tests.py
index 7860edd..4fc477a 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -1,10 +1,10 @@
 # flake8: noqa
-from .deprecations import *
-from .forms import *
-from .gis import GisTests
-from .modelforms import *
-from .layouts import *
-from .rendering import *
-from .templatetags import *
-from .widgets import *
-from .fields import *
+from .test_deprecations import *
+from .test_forms import *
+from .test_gis import GisTests
+from .test_modelforms import *
+from .test_layouts import *
+from .test_rendering import *
+from .test_templatetags import *
+from .test_widgets import *
+from .test_fields import *