You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/24 13:23:56 UTC
[1/2] git commit: updated refs/heads/master to b8a38ca
Updated Branches:
refs/heads/master e6bad5c83 -> b8a38ca7b
CLOUDSTACK-3724: optimizing cleanup
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 8b7d00ee4de53d15a1d495c3c1fdd166b1651460)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b8f1bde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b8f1bde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b8f1bde
Branch: refs/heads/master
Commit: 2b8f1bde8f8e3c399baf44695c10866798e1fe45
Parents: e6bad5c
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Jul 24 14:10:36 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 24 16:53:32 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_vpc_vms_deployment.py | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b8f1bde/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index 194b406..bef5f45 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -153,7 +153,6 @@ class Services:
},
"ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
- "sleep": 60,
"timeout": 10,
"mode": 'advanced'
}
@@ -219,10 +218,6 @@ class TestVMDeployVPC(cloudstackTestCase):
try:
#Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, self.cleanup)
- wait_for_cleanup(self.apiclient, [
- "network.gc.interval",
- "network.gc.wait"])
-
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -305,7 +300,6 @@ class TestVMDeployVPC(cloudstackTestCase):
self.services["vpc_offering"]
)
- self._cleanup.append(vpc_off)
self.validate_vpc_offering(vpc_off)
self.debug("Enabling the VPC offering created")
[2/2] git commit: updated refs/heads/master to b8a38ca
Posted by ts...@apache.org.
CLOUDSTACK-3594: Fix regression in Affinity Groups tests
One of the patches introduced a regression where account
and domainid parameters were changed. Therefore Affinity
Groups for those accounts were not found and tests failed.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 4a7f5d59d6f77fdeb5623937f4efa2542f891573)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8a38ca7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8a38ca7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8a38ca7
Branch: refs/heads/master
Commit: b8a38ca7bd866db32dba644f8fc1be5d3406e16c
Parents: 2b8f1bd
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Wed Jul 24 16:13:35 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 24 16:53:45 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8a38ca7/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 6e49ae5..0f6fdc5 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -3020,9 +3020,9 @@ class AffinityGroup:
if name is not None:
cmd.name = name
if account is not None:
- cmd.accountname = account
+ cmd.account = account
if domainid is not None:
- cmd.domaindid = domainid
+ cmd.domainid = domainid
return apiclient.deleteAffinityGroup(cmd)