x/cloud-init
Code Issues Proposed changes

replace 'with self.assertRaises(Exception):' with different form

Browse Source 
I'm guessing that
   with self.assertRaises(Exception):
      something here
is an acceptable form in a newer or older python.  But my
python (2.7.3-0ubuntu7) doesn't like it.

Interestingly, python unittest doc says:
 | Changed in version 2.7: Added the ability to use assertRaises() as 
 | a context manager.
This commit is contained in:
Scott Moser 2012-11-13 08:48:19 -05:00
parent 5c8a461074
commit 61d3b89ed0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unittests/test_distros/test_resolv.py
View File

@ -38,8 +38,7 @@ class TestResolvHelper(MockerTestCase):
self.assertNotIn('10.3', rp.nameservers) self.assertNotIn('10.3', rp.nameservers)
self.assertEquals(len(rp.nameservers), 3) self.assertEquals(len(rp.nameservers), 3)
rp.add_nameserver('10.2') rp.add_nameserver('10.2')
with self.assertRaises(ValueError): self.assertRaises(ValueError, rp.add_nameserver, '10.3')
rp.add_nameserver('10.3')
self.assertNotIn('10.3', rp.nameservers) self.assertNotIn('10.3', rp.nameservers)
def test_search_domains(self): def test_search_domains(self):
@ -58,6 +57,5 @@ class TestResolvHelper(MockerTestCase):
self.assertEquals(len(rp.search_domains), 5) self.assertEquals(len(rp.search_domains), 5)
rp.add_search_domain('bbb4.y.com') rp.add_search_domain('bbb4.y.com')
self.assertEquals(len(rp.search_domains), 6) self.assertEquals(len(rp.search_domains), 6)
with self.assertRaises(ValueError): self.assertRaises(ValueError, rp.add_search_domain, 'bbb5.y.com')
rp.add_search_domain('bbb5.y.com')
self.assertEquals(len(rp.search_domains), 6) self.assertEquals(len(rp.search_domains), 6)