You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 23:13:59 UTC
[31/50] [abbrv] git commit: updated refs/heads/4.4 to 2025f35
CLOUDSTACK-6984: Resolving simulator issues
(cherry picked from commit 8de18f144c680287c762a4b5db1b6e1d596f5723)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c98064b9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c98064b9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c98064b9
Branch: refs/heads/4.4
Commit: c98064b98dc17981a77246bf0019b92a499fb210
Parents: 1430a6c
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Jun 24 07:28:50 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 23:12:51 2014 +0200
----------------------------------------------------------------------
test/integration/smoke/test_network.py | 30 ++++++++++++-----------
test/integration/smoke/test_vm_life_cycle.py | 2 +-
tools/marvin/marvin/lib/base.py | 2 +-
3 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c98064b9/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 0ae777e..988a162 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -744,7 +744,8 @@ class TestReleaseIP(cloudstackTestCase):
ip_addrs = list_publicIP(
self.apiclient,
account=self.account.name,
- domainid=self.account.domainid
+ domainid=self.account.domainid,
+ issourcenat=False
)
try:
self.ip_addr = ip_addrs[0]
@@ -773,7 +774,7 @@ class TestReleaseIP(cloudstackTestCase):
def tearDown(self):
cleanup_resources(self.apiclient, self.cleanup)
- @attr(tags = ["advanced", "advancedns", "smoke"], required_hardware="false", BugId="CLOUDSTACK-6984")
+ @attr(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
def test_releaseIP(self):
"""Test for release public IP address"""
@@ -781,21 +782,22 @@ class TestReleaseIP(cloudstackTestCase):
self.ip_address.delete(self.apiclient)
- # Sleep to ensure that deleted state is reflected in other calls
- time.sleep(self.services["sleep"])
+ retriesCount = 10
+ isIpAddressDisassociated = False
- # ListPublicIpAddresses should not list deleted Public IP address
- list_pub_ip_addr_resp = list_publicIP(
+ while retriesCount > 0:
+ listResponse = list_publicIP(
self.apiclient,
id=self.ip_addr.id
- )
- self.debug("List Public IP response" + str(list_pub_ip_addr_resp))
-
- self.assertEqual(
- list_pub_ip_addr_resp,
- None,
- "Check if disassociated IP Address is no longer available"
- )
+ )
+ if listResponse is None:
+ isIpAddressDisassociated = True
+ break
+ retriesCount -= 1
+ time.sleep(60)
+ # End while
+
+ self.assertTrue(isIpAddressDisassociated, "Failed to disassociate IP address")
# ListPortForwardingRules should not list
# associated rules with Public IP address
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c98064b9/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 9ab7848..e346157 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -304,7 +304,7 @@ class TestVMLifeCycle(cloudstackTestCase):
return
- @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false", BugId="CLOUDSTACK-6984")
+ @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
def test_01_stop_vm(self):
"""Test Stop Virtual Machine
"""
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c98064b9/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index d45b7cc..1ed8c72 100644
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -592,7 +592,7 @@ class VirtualMachine:
validationresult = validateList(vms)
if validationresult[0] == FAIL:
raise Exception("VM list validation failed: %s" % validationresult[2])
- elif str(vms[0].state).lower() == str(state).lower():
+ elif str(vms[0].state).lower().decode("string_escape") == str(state).lower():
returnValue = [PASS, None]
break
except Exception as e: