cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [17/24] git commit: updated refs/heads/4.4 to e33d4a5
Date Mon, 28 Jul 2014 15:44:44 GMT
CLOUDSTACK-6726: Fixing BVT test case test_network.py

(cherry picked from commit 3125ae5c6a7a286a4891755e0d8d57bfc6e7ce97)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51442f35
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51442f35
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51442f35

Branch: refs/heads/4.4
Commit: 51442f355c0195cdd3b1b89f63e1e1e52d917327
Parents: 84ba19d
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue May 27 14:37:07 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jul 28 17:43:26 2014 +0200

----------------------------------------------------------------------
 test/integration/smoke/test_network.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51442f35/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 838f4a3..bf460da 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -383,12 +383,13 @@ class TestPortForwarding(cloudstackTestCase):
 
         try:
             nat_rule.delete(self.apiclient)
-            list_nat_rule_response = list_nat_rules(
-                                                self.apiclient,
-                                                id=nat_rule.id
-                                                )
-        except CloudstackAPIException:
-            self.fail("Nat Rule Deletion or Listing Failed")
+        except Exception as e:
+            self.fail("NAT Rule Deletion Failed: %s" % e)
+
+        # NAT rule listing should fail as the nat rule does not exist
+        with self.assertRaises(Exception):
+            list_nat_rules(self.apiclient,
+                           id=nat_rule.id)
 
         # Check if the Public SSH port is inaccessible
         with self.assertRaises(Exception):


Mime
View raw message