cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject [1/3] git commit: updated refs/heads/4.4-forward to 24ef79a
Date Tue, 27 May 2014 09:17:57 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward c535b8948 -> 24ef79aef


CLOUDSTACK-6726: Fixing BVT test case test_network.py


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

Branch: refs/heads/4.4-forward
Commit: 3125ae5c6a7a286a4891755e0d8d57bfc6e7ce97
Parents: c535b89
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue May 27 14:37:07 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Tue May 27 14:47:10 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3125ae5c/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index f81e95f..4100878 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