Mercurial > p > roundup > code
changeset 5453:2b4f606d8e72
use exception.args instead of exception.message
| author | Christof Meerwald <cmeerw@cmeerw.org> |
|---|---|
| date | Mon, 23 Jul 2018 21:39:46 +0100 |
| parents | b50a4c85c270 |
| children | fbbcbfc6dad0 |
| files | test/test_cgi.py test/test_hyperdbvals.py |
| diffstat | 2 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/test/test_cgi.py Sun Jul 22 22:38:53 2018 +0100 +++ b/test/test_cgi.py Mon Jul 23 21:39:46 2018 +0100 @@ -1643,7 +1643,7 @@ def te(url, exception, raises=ValueError): with self.assertRaises(raises) as cm: examine_url(url) - self.assertEqual(cm.exception.message, exception) + self.assertEqual(cm.exception.args, (exception,)) action = actions.Action(self.client) @@ -1786,8 +1786,8 @@ # be determined. with self.assertRaises(NoTemplate) as cm: t.selectTemplate("user", "") - self.assertEqual(cm.exception.message, - '''Template "user" doesn't exist''') + self.assertEqual(cm.exception.args, + ('''Template "user" doesn't exist''',)) # there is no html/subdir/user.item.{,xml,html} so it will # raise NoTemplate.
--- a/test/test_hyperdbvals.py Sun Jul 22 22:38:53 2018 +0100 +++ b/test/test_hyperdbvals.py Mon Jul 23 21:39:46 2018 +0100 @@ -151,8 +151,8 @@ with self.assertRaises(hyperdb.HyperdbValueError) as cm: self._test('multilink3', '1', '1') - self.assertEqual(cm.exception.message, - "property multilink3: '1' is not a test.") + self.assertEqual(cm.exception.args, + ("property multilink3: '1' is not a test.",)) self.assertEqual(self._test('multilink3', 'valid', '1'), ['1']) @@ -161,21 +161,21 @@ with self.assertRaises(hyperdb.HyperdbValueError) as cm: self._test('multilink3', '+1', '1') - self.assertEqual(cm.exception.message, - "property multilink3: '1' is not a test.") + self.assertEqual(cm.exception.args, + ("property multilink3: '1' is not a test.",)) self.assertEqual(self._test('multilink3', '+valid', '1'), ['1', '2', '3']) with self.assertRaises(hyperdb.HyperdbValueError) as cm: self._test('multilink3', '+1,-2', '1') - self.assertEqual(cm.exception.message, - "property multilink3: '1' is not a test.") + self.assertEqual(cm.exception.args, + ("property multilink3: '1' is not a test.",)) with self.assertRaises(hyperdb.HyperdbValueError) as cm: self._test('multilink3', '+valid,-2', '1') - self.assertEqual(cm.exception.message, - "property multilink3: '2' is not a test.") + self.assertEqual(cm.exception.args, + ("property multilink3: '2' is not a test.",)) self.assertEqual(self._test('multilink3', '+valid,-2valid', '1'), ['1', '3']) @@ -185,7 +185,7 @@ with self.assertRaises(hyperdb.HyperdbValueError) as cm: result = self._test('multilink3', '-valid', None) - self.assertEqual(cm.exception.message, - "property multilink3: 'valid' is not currently an element") + self.assertEqual(cm.exception.args, + ("property multilink3: 'valid' is not currently an element",)) # vim: set filetype=python ts=4 sw=4 et si