diff options
| author | Tang Chen <chen.tang@easystack.cn> | 2016-02-14 18:43:19 +0800 |
|---|---|---|
| committer | Tang Chen <chen.tang@easystack.cn> | 2016-02-14 18:43:19 +0800 |
| commit | cfcb750a97af1ab82b425532437456c22dcebad9 (patch) | |
| tree | 5064b1fbe9b6853ff4e353d3eef56dfaeb16ccc3 /openstackclient/tests/network | |
| parent | d8abec33ada8b2b028d52eb8bfad2640812b9af8 (diff) | |
| download | python-openstackclient-cfcb750a97af1ab82b425532437456c22dcebad9.tar.gz | |
Use assertRaises() to check if an exception is raised
In some test cases, try/except is used to check if an exception
has been raised. We should use assertRaises() instead.
Change-Id: I15c8e757dcab77fd6f895feb018184e1eb7e617b
Diffstat (limited to 'openstackclient/tests/network')
| -rw-r--r-- | openstackclient/tests/network/v2/test_network.py | 16 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_router.py | 23 |
2 files changed, 15 insertions, 24 deletions
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py index d6c6fbca..4b73e680 100644 --- a/openstackclient/tests/network/v2/test_network.py +++ b/openstackclient/tests/network/v2/test_network.py @@ -103,11 +103,9 @@ class TestCreateNetworkIdentityV3(TestNetwork): arglist = [] verifylist = [] - try: - # Missing required args should bail here - self.check_parser(self.cmd, arglist, verifylist) - except tests_utils.ParserException: - pass + # Missing required args should bail here + self.assertRaises(tests_utils.ParserException, self.check_parser, + self.cmd, arglist, verifylist) def test_create_default_options(self): arglist = [ @@ -542,11 +540,9 @@ class TestShowNetwork(TestNetwork): arglist = [] verifylist = [] - try: - # Missing required args should bail here - self.check_parser(self.cmd, arglist, verifylist) - except tests_utils.ParserException: - pass + # Missing required args should bail here + self.assertRaises(tests_utils.ParserException, self.check_parser, + self.cmd, arglist, verifylist) def test_show_all_options(self): arglist = [ diff --git a/openstackclient/tests/network/v2/test_router.py b/openstackclient/tests/network/v2/test_router.py index 69c548a0..05bb7857 100644 --- a/openstackclient/tests/network/v2/test_router.py +++ b/openstackclient/tests/network/v2/test_router.py @@ -63,10 +63,9 @@ class TestCreateRouter(TestRouter): arglist = [] verifylist = [] - try: - self.check_parser(self.cmd, arglist, verifylist) - except tests_utils.ParserException: - pass + # Missing required args should bail here + self.assertRaises(tests_utils.ParserException, self.check_parser, + self.cmd, arglist, verifylist) def test_create_default_options(self): arglist = [ @@ -303,11 +302,9 @@ class TestSetRouter(TestRouter): ('distributed', False), ] - try: - # Argument parse failing should bail here - self.check_parser(self.cmd, arglist, verifylist) - except tests_utils.ParserException: - pass + # Missing required args should bail here + self.assertRaises(tests_utils.ParserException, self.check_parser, + self.cmd, arglist, verifylist) def test_set_nothing(self): arglist = [self._router.name, ] @@ -353,11 +350,9 @@ class TestShowRouter(TestRouter): arglist = [] verifylist = [] - try: - # Missing required args should bail here - self.check_parser(self.cmd, arglist, verifylist) - except tests_utils.ParserException: - pass + # Missing required args should bail here + self.assertRaises(tests_utils.ParserException, self.check_parser, + self.cmd, arglist, verifylist) def test_show_all_options(self): arglist = [ |