cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daan Hoogland <daan.hoogl...@gmail.com>
Subject [ACS44][TEST] test_network diff
Date Sun, 03 Aug 2014 18:41:11 GMT
H test developers,

One of the diffs between 4.4 and 4.4-forward I am not sure of is the folowing

diff --git a/test/integration/smoke/test_network.py
b/test/integration/smoke/test_network.py
index 988a162..4943b47 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -383,13 +383,12 @@ class TestPortForwarding(cloudstackTestCase):

         try:
             nat_rule.delete(self.apiclient)
-        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)
+            list_nat_rule_response = list_nat_rules(
+                                                self.apiclient,
+                                                id=nat_rule.id
+                                                )
+        except CloudstackAPIException:
+            self.fail("Nat Rule Deletion or Listing Failed")

         # Check if the Public SSH port is inaccessible
         with self.assertRaises(Exception):

It would seem that the original (- minus signs) is the one to keep,
please comment on this

-- 
Daan

Mime
View raw message