From d601ecba9a7468625a19c4b85428e924b9c420a8 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.be>
Date: Wed, 21 May 2014 11:00:52 +0200
Subject: [PATCH] Minor cosmetic fixes on pytest integration tests.

---
 tests/integration/test_auth_api.py        |  5 +----
 tests/integration/test_userstorage_api.py | 16 +++++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/tests/integration/test_auth_api.py b/tests/integration/test_auth_api.py
index f2bd0484..d33f3dff 100644
--- a/tests/integration/test_auth_api.py
+++ b/tests/integration/test_auth_api.py
@@ -1,8 +1,7 @@
 from unittest import mock
-
 import pytest
 
-from rest_framework.reverse import reverse
+from django.core.urlresolvers import reverse
 
 from .. import factories
 
@@ -20,7 +19,6 @@ def teardown_module(module):
 
 
 class TestPublicRegistration:
-
     @classmethod
     def setup_class(cls):
         cls.form = {"username": "username", "password": "password", "first_name": "fname",
@@ -39,7 +37,6 @@ class TestPublicRegistration:
 
 @pytest.mark.xfail
 class TestPrivateRegistration:
-
     @classmethod
     def setup_class(cls):
         cls.form = {"username": "username", "password": "password", "first_name": "fname",
diff --git a/tests/integration/test_userstorage_api.py b/tests/integration/test_userstorage_api.py
index f3ef0328..10dbdcc9 100644
--- a/tests/integration/test_userstorage_api.py
+++ b/tests/integration/test_userstorage_api.py
@@ -1,16 +1,14 @@
+import json
 import pytest
 
-from rest_framework.reverse import reverse
-
+from django.core.urlresolvers import reverse
 from .. import factories
 
-import json
-
 
 pytestmark = pytest.mark.django_db
 
 
-class TestListStorageEntries:
+class TestListStorageEntries(object):
     def _load_initial_data(self):
         self.user1 = factories.UserFactory()
         self.user2 = factories.UserFactory()
@@ -53,7 +51,7 @@ class TestListStorageEntries:
         response = client.logout()
 
 
-class TestViewStorageEntries:
+class TestViewStorageEntries(object):
     def _load_initial_data(self):
         self.user1 = factories.UserFactory()
         self.user2 = factories.UserFactory()
@@ -89,7 +87,7 @@ class TestViewStorageEntries:
         response = client.logout()
 
 
-class TestCreateStorageEntries:
+class TestCreateStorageEntries(object):
     @classmethod
     def setup_class(cls):
         cls.form = {"key": "foo",
@@ -135,7 +133,7 @@ class TestCreateStorageEntries:
         response = client.logout()
 
 
-class TestUpdateStorageEntries:
+class TestUpdateStorageEntries(object):
     @classmethod
     def setup_class(cls):
         cls.form = {"value": "bar"}
@@ -184,7 +182,7 @@ class TestUpdateStorageEntries:
         response = client.logout()
 
 
-class TestDeleteStorageEntries:
+class TestDeleteStorageEntries(object):
     def _load_initial_data(self):
         self.user1 = factories.UserFactory()
         self.user2 = factories.UserFactory()