diff options
| author | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
|---|---|---|
| committer | Leonardo Schäffer <leonardo.schaffer@gmail.com> | 2015-06-25 11:20:44 -0300 |
| commit | 42f31aa607750eb7c00224e7c1c353b27cbd7519 (patch) | |
| tree | 4bbfae731c8427c526f22bacb9136e5ed3e69d8c /service/test/support | |
| parent | 7f349abe67b8e1a71798478f6c26b08773f2d869 (diff) | |
| parent | 0b179c61043a9854fa23b8fd40fd252864ecd021 (diff) | |
Merge branch 'master' into floatlabel_for_compose
Diffstat (limited to 'service/test/support')
| -rw-r--r-- | service/test/support/dispatcher/proxy.py | 2 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/service/test/support/dispatcher/proxy.py b/service/test/support/dispatcher/proxy.py index d4cb95ee..ca3bbc41 100644 --- a/service/test/support/dispatcher/proxy.py +++ b/service/test/support/dispatcher/proxy.py @@ -87,7 +87,7 @@ class MainHandler(tornado.web.RequestHandler): except tornado.httpclient.HTTPError, x: if hasattr(x, 'response') and x.response: self.handle_response(x.response) - except Exception, e: + except Exception: self.set_status(500) self.write("Internal server error:\n" + ''.join(traceback.format_exception(*sys.exc_info()))) self.finish() diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index a1b0c3b8..52372507 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -62,7 +62,7 @@ class AppTestClient(object): self.soledad_querier = self._create_soledad_querier(self.soledad, self.INDEX_KEY) self.keymanager = mock() - self.search_engine = SearchEngine(self.soledad_querier, agent_home=soledad_test_folder) + self.search_engine = SearchEngine(self.INDEX_KEY, agent_home=soledad_test_folder) self.mail_sender = self._create_mail_sender() self.account = SoledadBackedAccount(self.ACCOUNT, self.soledad, MagicMock()) @@ -73,7 +73,7 @@ class AppTestClient(object): self.search_engine.index_mails(self.mail_service.all_mails()) self.resource = RootResource() - self.resource.initialize(self.soledad_querier, self.keymanager, self.search_engine, self.mail_service, self.draft_service) + self.resource.initialize(self.keymanager, self.search_engine, self.mail_service, self.draft_service) def _render(self, request, as_json=True): def get_str(_str): |