cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/master to 3e3dc73
Date Tue, 27 May 2014 09:11:21 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 26fa623ff -> 3e3dc7327


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/3e3dc732
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e3dc732
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e3dc732

Branch: refs/heads/master
Commit: 3e3dc7327179cf8b8a45a66e93c20ddcfa02b603
Parents: 26fa623
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:37:07 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/3e3dc732/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index a9e0c25..52efc32 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -389,12 +389,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