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, 14 insertions, 0 deletions

diff --git a/tests/users/__init__.py b/tests/users/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/users/__init__.py
diff --git a/tests/users/models.py b/tests/users/models.py
new file mode 100644
index 00000000..128bac90
--- /dev/null
+++ b/tests/users/models.py
@@ -0,0 +1,6 @@
+from django.db import models
+
+
+class User(models.Model):
+    account = models.ForeignKey('accounts.Account', blank=True, null=True, related_name='users')
+    active_record = models.ForeignKey('records.Record', blank=True, null=True)
diff --git a/tests/users/serializers.py b/tests/users/serializers.py
new file mode 100644
index 00000000..4893ddb3
--- /dev/null
+++ b/tests/users/serializers.py
@@ -0,0 +1,8 @@
+from rest_framework import serializers
+
+from tests.users.models import User
+
+
+class UserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User