Use cleaner failure testing.

tornadoweb · Aug 4, 2014 · 6963d0f · 6963d0f
1 parent fe74476
commit 6963d0f
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/cyclone/tests/test_httpclient.py b/cyclone/tests/test_httpclient.py
@@ -162,25 +162,15 @@ def test_rpc_request_error(self):
         response.code = 200
         response.body = escape.json_encode({"error": {"message": "failed"}})
         cyclone.httpclient.fetch.return_value = succeed(response)
-        try:
-            yield self.client.foo()
-        except Exception, e:
-            self.assertEqual(e.message, "failed")
-        else:
-            raise Exception("Should raise an error.")
+        yield self.assertFailure(self.client.foo(), Exception)
 
     @inlineCallbacks
     def test_rpc_request_error_old(self):
         response = Mock()
         response.code = 200
         response.body = escape.json_encode({"error": "some error"})
         cyclone.httpclient.fetch.return_value = succeed(response)
-        try:
-            yield self.client.foo()
-        except Exception, e:
-            self.assertEqual(e.message, "some error")
-        else:
-            raise Exception("Should raise an error.")
+        yield self.assertFailure(self.client.foo(), Exception)
 
     @inlineCallbacks
     def test_rpc_request_404(self):
@@ -189,9 +179,4 @@ def test_rpc_request_404(self):
         response.phrase = "Not found."
         response.body = escape.json_encode({"result": True})
         cyclone.httpclient.fetch.return_value = succeed(response)
-        try:
-            yield self.client.foo()
-        except HTTPError, e:
-            self.assertEqual(e.log_message, "Not found.")
-        else:
-            raise Exception("Should raise an error.")
+        yield self.assertFailure(self.client.foo(), HTTPError)