You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/08/16 12:55:43 UTC
[12/50] git commit: updated refs/heads/saml2 to 09da909
CLOUDSTACK-7321: Resolved cleanup issue in test_network.py
Signed-off-by: Santhosh Edukulla <sa...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f9a66655
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f9a66655
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f9a66655
Branch: refs/heads/saml2
Commit: f9a66655e353fa3ff25d4231cf6cd60f7e9500e6
Parents: a22abeb
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Aug 12 18:41:47 2014 +0530
Committer: Santhosh Edukulla <sa...@gmail.com>
Committed: Wed Aug 13 10:07:33 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_network.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9a66655/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 08ec0d3..cca1803 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -609,10 +609,9 @@ class TestRebootRouter(cloudstackTestCase):
self.services["natrule"],
ipaddressid=self.public_ip.ipaddress.id
)
- self.cleanup = [
- self.vm_1,
+ self.cleanup = [self.nat_rule,
lb_rule,
- self.nat_rule,
+ self.vm_1,
self.service_offering,
self.account,
]