Repository: libcloud Updated Branches: refs/heads/trunk b5902a106 -> b949a3bea
Use `assertRaises` to simplify testing code. Closes #471 Signed-off-by: Eric Johnson <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b949a3be Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b949a3be Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b949a3be Branch: refs/heads/trunk Commit: b949a3bea8fedc81b9426c50f7864639ea2731ef Parents: b5902a1 Author: Misha Brukman <[email protected]> Authored: Wed Feb 11 22:31:08 2015 -0500 Committer: Eric Johnson <[email protected]> Committed: Sun Mar 1 02:46:29 2015 +0000 ---------------------------------------------------------------------- libcloud/test/compute/test_cloudstack.py | 22 ++++++++-------------- libcloud/test/compute/test_gridspot.py | 7 +------ libcloud/test/compute/test_ktucloud.py | 18 ++++++++---------- 3 files changed, 17 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/b949a3be/libcloud/test/compute/test_cloudstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_cloudstack.py b/libcloud/test/compute/test_cloudstack.py index 8eff8a9..38f01b8 100644 --- a/libcloud/test/compute/test_cloudstack.py +++ b/libcloud/test/compute/test_cloudstack.py @@ -75,25 +75,19 @@ class CloudStackCommonTestCase(TestCaseMixin): size = self.driver.list_sizes()[0] image = self.driver.list_images()[0] CloudStackMockHttp.fixture_tag = 'deployfail' - try: - self.driver.create_node(name='node-name', - image=image, - size=size) - except: - return - self.assertTrue(False) + self.assertRaises( + Exception, + self.driver.create_node, + name='node-name', image=image, size=size) def test_create_node_delayed_failure(self): size = self.driver.list_sizes()[0] image = self.driver.list_images()[0] CloudStackMockHttp.fixture_tag = 'deployfail2' - try: - self.driver.create_node(name='node-name', - image=image, - size=size) - except: - return - self.assertTrue(False) + self.assertRaises( + Exception, + self.driver.create_node, + name='node-name', image=image, size=size) def test_create_node_default_location_success(self): size = self.driver.list_sizes()[0] http://git-wip-us.apache.org/repos/asf/libcloud/blob/b949a3be/libcloud/test/compute/test_gridspot.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_gridspot.py b/libcloud/test/compute/test_gridspot.py index eec4506..4e4de1b 100644 --- a/libcloud/test/compute/test_gridspot.py +++ b/libcloud/test/compute/test_gridspot.py @@ -46,12 +46,7 @@ class GridspotTest(unittest.TestCase, TestCaseMixin): Tests the error-handling for passing a bad API Key to the Gridspot API """ GridspotMockHttp.type = 'BAD_AUTH' - try: - self.driver.list_nodes() - # Above command should have thrown an InvalidCredsException - self.assertTrue(False) - except InvalidCredsError: - pass + self.assertRaises(InvalidCredsError, self.driver.list_nodes) def test_list_nodes(self): nodes = self.driver.list_nodes() http://git-wip-us.apache.org/repos/asf/libcloud/blob/b949a3be/libcloud/test/compute/test_ktucloud.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ktucloud.py b/libcloud/test/compute/test_ktucloud.py index 83a0838..2a27de1 100644 --- a/libcloud/test/compute/test_ktucloud.py +++ b/libcloud/test/compute/test_ktucloud.py @@ -49,21 +49,19 @@ class KTUCloudNodeDriverTest(unittest.TestCase, TestCaseMixin): size = self.driver.list_sizes()[0] image = self.driver.list_images()[0] KTUCloudStackMockHttp.fixture_tag = 'deployfail' - try: - self.driver.create_node(name='node-name', image=image, size=size) - except: - return - self.assertTrue(False) + self.assertRaises( + Exception, + self.driver.create_node, + name='node-name', image=image, size=size) def test_create_node_delayed_failure(self): size = self.driver.list_sizes()[0] image = self.driver.list_images()[0] KTUCloudStackMockHttp.fixture_tag = 'deployfail2' - try: - self.driver.create_node(name='node-name', image=image, size=size) - except: - return - self.assertTrue(False) + self.assertRaises( + Exception, + self.driver.create_node, + name='node-name', image=image, size=size) def test_list_images_no_images_available(self): KTUCloudStackMockHttp.fixture_tag = 'notemplates'
