cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/master to bb95624
Date Thu, 01 Aug 2013 06:15:04 GMT
Updated Branches:
  refs/heads/master 6ec9a4442 -> bb9562470


Automation: More fix for test_vpc_network_lbrules.py


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

Branch: refs/heads/master
Commit: bb956247087856dd8f895efc529f8c596e1937f3
Parents: 6ec9a44
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Wed Jul 31 23:13:24 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Wed Jul 31 23:14:50 2013 -0700

----------------------------------------------------------------------
 test/integration/component/test_vpc_network_lbrules.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb956247/test/integration/component/test_vpc_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index 074d474..5aa626a 100644
--- a/test/integration/component/test_vpc_network_lbrules.py
+++ b/test/integration/component/test_vpc_network_lbrules.py
@@ -975,14 +975,10 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         public_ip_1 = self.acquire_Public_IP(network_1)
         lb_rule = self.create_LB_Rule(public_ip_1, network_1, [vm_2, vm_1])
         public_ip_1.delete(self.apiclient)
-        lb_rules = LoadBalancerRule.list(self.apiclient,
+
+        with self.assertRaises(Exception):
+            lb_rules = LoadBalancerRule.list(self.apiclient,
                                         id=lb_rule.id,
                                         listall=True
                                         )
-        self.assertEqual(lb_rules,
-                        None,
-                        "Failed LB rule is present on the VR"
-                        )
-
-
         return


Mime
View raw message