← Back to branch summary

~tribaal/txaws/xss-hardening

« back to all changes in this revision

Viewing changes to txaws/ec2/tests/test_client.py

Merged silence-deprecation-warnings [r=oubiwann] [f=768311]

Exception.message is no longer accessed which silences deprecation
warnings in Python 2.6.  Variables are explicitly compared with None
which silences deprecation warnings in Python 2.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/ec2/tests/test_client.py
1426
1426
        self.assertEquals(failure.type, type(error))
1427
1427
        self.assertFalse(isinstance(error, EC2Error))
1428
1428
        self.assertTrue(isinstance(error, Exception))
1429
 
        self.assertEquals(error.message, "found")
 
1429
        self.assertEquals(str(error), "found")
1430
1430
 
1431
1431
    def test_400_error(self):
1432
1432
        failure = self.make_failure(400, TwistedWebError)
1478
1478
        error = self.assertRaises(Exception, client.ec2_error_wrapper, failure)
1479
1479
        self.assertFalse(isinstance(error, EC2Error))
1480
1480
        self.assertTrue(isinstance(error, Exception))
1481
 
        self.assertEquals(error.message, "A server error occurred")
 
1481
        self.assertEquals(str(error), "A server error occurred")
1482
1482
 
1483
1483
    def test_timeout_error(self):
1484
1484
        failure = self.make_failure(type=Exception, message="timeout")
1485
1485
        error = self.assertRaises(Exception, client.ec2_error_wrapper, failure)
1486
1486
        self.assertFalse(isinstance(error, EC2Error))
1487
1487
        self.assertTrue(isinstance(error, Exception))
1488
 
        self.assertEquals(error.message, "timeout")
 
1488
        self.assertEquals(str(error), "timeout")
1489
1489
 
1490
1490
    def test_connection_error(self):
1491
1491
        failure = self.make_failure(type=ConnectionRefusedError)