use test client in test case through composition instead of inheritance

1 files changed, 11 insertions, 8 deletions

diff --git a/service/test/integration/test_logout.py b/service/test/integration/test_logout.py
index da414126..e67fabab 100644
--- a/service/test/integration/test_logout.py
+++ b/service/test/integration/test_logout.py
@@ -15,29 +15,32 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import json
 
+from mock import patch
 from mockito import verify
 from twisted.internet import defer
 
-from test.support.integration.multi_user_client import MultiUserClient
-from test.support.integration.soledad_test_base import SoledadTestBase
+from test.support.integration.soledad_test_base import MultiUserSoledadTestBase
 
 
-class MultiUserLogoutTest(MultiUserClient, SoledadTestBase):
+class MultiUserLogoutTest(MultiUserSoledadTestBase):
 
     @defer.inlineCallbacks
     def wait_for_session_user_id_to_finish(self):
-        yield self.adaptor.initialize_store(self.soledad)
+        yield self.adaptor.initialize_store(self.app_test_client.soledad)
 
     @defer.inlineCallbacks
     def test_logout_deletes_services_stop_background_reactor_tasks_and_closes_soledad(self):
-        response, login_request = yield self.login()
+        response, login_request = yield self.app_test_client.login()
         yield response
 
         yield self.wait_for_session_user_id_to_finish()
 
-        response, request = self.post("/logout", json.dumps({'csrftoken': [login_request.getCookie('XSRF-TOKEN')]}),
-                                      from_request=login_request, as_json=False)
+        response, request = self.app_test_client.post(
+            "/logout",
+            json.dumps({'csrftoken': [login_request.getCookie('XSRF-TOKEN')]}),
+            from_request=login_request,
+            as_json=False)
         yield response
 
         self.assertEqual(302, request.responseCode)     # redirected
-        verify(self.services).close()
+        verify(self.app_test_client.services).close()