Remove unnecessary try / except blocks.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ccf8f4bc Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ccf8f4bc Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ccf8f4bc Branch: refs/heads/trunk Commit: ccf8f4bcd24f6b8cc3ef0d8098ce069e2da94189 Parents: 89afb61 Author: Tomaz Muraus <[email protected]> Authored: Fri Oct 11 20:58:36 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Fri Oct 11 20:58:36 2013 +0200 ---------------------------------------------------------------------- libcloud/test/compute/test_openstack.py | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ccf8f4bc/libcloud/test/compute/test_openstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_openstack.py b/libcloud/test/compute/test_openstack.py index 288e40a..32dc91e 100644 --- a/libcloud/test/compute/test_openstack.py +++ b/libcloud/test/compute/test_openstack.py @@ -948,34 +948,22 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual(self.driver.detach_volume(volume), True) def test_ex_set_password(self): - try: - self.driver.ex_set_password(self.node, 'New1&53jPass') - except Exception: - e = sys.exc_info()[1] - self.fail('An error was raised: ' + repr(e)) + self.assertTrue(self.driver.ex_set_password(self.node, 'New1&53jPass')) def test_ex_rebuild(self): image = NodeImage(id=11, name='Ubuntu 8.10 (intrepid)', driver=self.driver) - try: - success = self.driver.ex_rebuild(self.node, image=image) - self.assertTrue(success) - except Exception: - e = sys.exc_info()[1] - self.fail('An error was raised: ' + repr(e)) + success = self.driver.ex_rebuild(self.node, image=image) + self.assertTrue(success) def test_ex_rebuild_with_ex_disk_config(self): image = NodeImage(id=58, name='Ubuntu 10.10 (intrepid)', driver=self.driver) node = Node(id=12066, name=None, state=None, public_ips=None, private_ips=None, driver=self.driver) - try: - success = self.driver.ex_rebuild(node, image=image, - ex_disk_config='MANUAL') - self.assertTrue(success) - except Exception: - e = sys.exc_info()[1] - self.fail('An error was raised: ' + repr(e)) + success = self.driver.ex_rebuild(node, image=image, + ex_disk_config='MANUAL') + self.assertTrue(success) def test_ex_resize(self): size = NodeSize(1, '256 slice', None, None, None, None,
