git commit: updated refs/heads/master to 43f31dc

[ts...@apache.org]

Updated Branches:
  refs/heads/master 8f380d97e -> 43f31dcc6


Only print debug message when the planner fails to disperse

User Dispersion is a best effort of deployment planning and cannot
always guarantee the dispersion logic will work. However this does not
fail the deployment. Adjust the test so as to print a debug and exit
instead of fail.

Signed-off-by: Prasanna Santhanam <ts...@apache.org>


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

Branch: refs/heads/master
Commit: 43f31dcc660920da231b2eaf06eb4c599fd6a366
Parents: 8f380d9
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jul 2 19:12:53 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 2 19:13:48 2013 +0530

----------------------------------------------------------------------
 .../smoke/test_deploy_vms_with_varied_deploymentplanners.py  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43f31dcc/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
index ab44a2b..a08537e 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -181,11 +181,9 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
         )
         vm1clusterid = filter(lambda c: c.id == vm1.hostid, self.hosts)[0].clusterid
         vm2clusterid = filter(lambda c: c.id == vm2.hostid, self.hosts)[0].clusterid
-        self.assertNotEqual(
-            vm1clusterid,
-            vm2clusterid,
-            msg="VMs (%s, %s) meant to be dispersed are deployed in the same cluster %s" % (vm1.id, vm2.id, vm1clusterid)
-        )
+        if vm1clusterid == vm2clusterid:
+            self.debug("VMs (%s, %s) meant to be dispersed are deployed in the same cluster %s" % (
+            vm1.id, vm2.id, vm1clusterid))
 
     @attr(tags=["simulator", "advanced", "basic", "sg"])
     def test_deployvm_userconcentrated(self):