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 0df156c
Date Tue, 24 Jun 2014 15:25:01 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master c79ab570b -> 0df156c09


CLOUDSTACK-6984: Resolving issues found during simulator run


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

Branch: refs/heads/master
Commit: 0df156c09e152845d6c6332fa1d91fe9c15c7cc6
Parents: c79ab57
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Jun 24 07:28:50 2014 -0700
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Tue Jun 24 20:54:05 2014 +0530

----------------------------------------------------------------------
 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/0df156c0/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 9ef5888..397d43b 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -750,7 +750,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]
@@ -779,7 +780,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"""
 
@@ -787,21 +788,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/0df156c0/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 e79fb94..92c8a27 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/0df156c0/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index ad2b875..7d2622e 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -586,7 +586,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:


Mime
View raw message