Merge remote-tracking branch 'pelme/pytest' into feature/pytest

Conflicts:
	.travis.yml
	rest_framework/runtests/runtests.py
	tests/test_filters.py
	tests/test_pagination.py
	tox.ini

3 files changed, 19 insertions, 0 deletions

diff --git a/tests/accounts/__init__.py b/tests/accounts/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/accounts/__init__.py
diff --git a/tests/accounts/models.py b/tests/accounts/models.py
new file mode 100644
index 00000000..3bf4a0c3
--- /dev/null
+++ b/tests/accounts/models.py
@@ -0,0 +1,8 @@
+from django.db import models
+
+from tests.users.models import User
+
+
+class Account(models.Model):
+    owner = models.ForeignKey(User, related_name='accounts_owned')
+    admins = models.ManyToManyField(User, blank=True, null=True, related_name='accounts_administered')
diff --git a/tests/accounts/serializers.py b/tests/accounts/serializers.py
new file mode 100644
index 00000000..57a91b92
--- /dev/null
+++ b/tests/accounts/serializers.py
@@ -0,0 +1,11 @@
+from rest_framework import serializers
+
+from tests.accounts.models import Account
+from tests.users.serializers import UserSerializer
+
+
+class AccountSerializer(serializers.ModelSerializer):
+    admins = UserSerializer(many=True)
+
+    class Meta:
+        model = Account