Merge pull request #275 from gandalfar/fix_pytest

Fix pytest South migrations, removed workaround for ambassadors test

Author: ercchy

api/tests.py renamed to api/test_processors.py

@@ -1,6 +1,5 @@
 [pytest]
 addopts = --reuse-db --strict --create-db
-python_files=*.py
 
 markers = 
     client: marks tests that use the django client (and hence run a bit slow)

mailer/tests.py renamed to mailer/test_mailer.py

@@ -21,7 +21,7 @@ oauthlib==0.6.1
 py==1.4.23
 pytest==2.6.0
 pytest-cov==1.7.0
-pytest-django==2.6.2
+-e git+https://github.com/pelme/pytest_django.git@f10e48d4fb7bca3fa2640f6f1c74c4c10655c76d#egg=pytest_django
 python-openid==2.2.5
 python-social-auth==0.1.21
 requests==2.2.1

pytest.ini

@@ -34,11 +34,7 @@ def test_get_ambassadors_for_country(self):
 		self.up1.country = "SI"
 		self.up1.save()
 
-		# temporary workaround because South migrations don't work yet
-		# fix me in the future
-		group, created = Group.objects.get_or_create(name="ambassadors")
-		if created:
-			group.save()
+		group = Group.objects.get(name="ambassadors")
 
 		group.user_set.add(self.u1)