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

1 files changed, 0 insertions, 15 deletions

diff --git a/rest_framework/tests/test_serializer_empty.py b/rest_framework/tests/test_serializer_empty.py
deleted file mode 100644
index 30cff361..00000000
--- a/rest_framework/tests/test_serializer_empty.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from django.test import TestCase
-from rest_framework import serializers
-
-
-class EmptySerializerTestCase(TestCase):
-    def test_empty_serializer(self):
-        class FooBarSerializer(serializers.Serializer):
-            foo = serializers.IntegerField()
-            bar = serializers.SerializerMethodField('get_bar')
-
-            def get_bar(self, obj):
-                return 'bar'
-
-        serializer = FooBarSerializer()
-        self.assertEquals(serializer.data, {'foo': 0})