You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2016/02/18 10:59:54 UTC

[1/2] git commit: updated refs/heads/master to 79edac0

Repository: cloudstack
Updated Branches:
  refs/heads/master bcbdb2caa -> 79edac0ee


CLOUDSTACK-9091: Update testpath for parameter issues


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

Branch: refs/heads/master
Commit: 358115de151ababd45d31a743f71edadc8cfafae
Parents: 3ded3e9
Author: Priti Sarap <pr...@clogeny.com>
Authored: Fri Nov 27 12:51:50 2015 +0530
Committer: Priti Sarap <pr...@clogeny.com>
Committed: Fri Nov 27 12:51:50 2015 +0530

----------------------------------------------------------------------
 test/integration/testpaths/testpath_volume_snapshot.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/358115de/test/integration/testpaths/testpath_volume_snapshot.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_volume_snapshot.py b/test/integration/testpaths/testpath_volume_snapshot.py
index 87c5fe4..c0e609a 100644
--- a/test/integration/testpaths/testpath_volume_snapshot.py
+++ b/test/integration/testpaths/testpath_volume_snapshot.py
@@ -805,13 +805,13 @@ class TestVolumeSnapshot(cloudstackTestCase):
             event_list_validation_result[2])
         self.debug("Events list contains event SNAPSHOT.CREATE")
 
+	self.testdata["volume"]["zoneid"] = self.zone.id
         volumeFromSnap = Volume.create_from_snapshot(
             self.apiclient,
             data_vol_snap.id,
             self.testdata["volume"],
             account=self.account.name,
             domainid=self.account.domainid,
-            zoneid=self.zone.id
         )
 
         self.assertTrue(
@@ -926,13 +926,13 @@ class TestVolumeSnapshot(cloudstackTestCase):
             "Check resource id in list resources call"
         )
 
+	self.testdata["volume"]["zoneid"] = self.zone.id
         volumeFromSnap_2 = Volume.create_from_snapshot(
             self.apiclient,
             data_vol_snap_2.id,
             self.testdata["volume"],
             account=self.account.name,
             domainid=self.account.domainid,
-            zoneid=self.zone.id
         )
 
         self.vm_2.attach_volume(


[2/2] git commit: updated refs/heads/master to 79edac0

Posted by sa...@apache.org.
Merge pull request #1130 from pritisarap12/CLOUDSTACK-9091-Update-testpath-for-parameter-issues

CLOUDSTACK-9091: Update testpath for parameter issuesIn testpath_volume_snapshot testpath creating volume from snapshot function is passing zonid parameter to function in base class but there it doesn't take as separate parameter it takes it from "services" so updating it.

* pr/1130:
  CLOUDSTACK-9091: Update testpath for parameter issues

Signed-off-by: sanjeev <sa...@apache.org>


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

Branch: refs/heads/master
Commit: 79edac0ee6d63d642e4df6f828295ffceed6149f
Parents: bcbdb2c 358115d
Author: sanjeev <sa...@apache.org>
Authored: Thu Feb 18 15:28:39 2016 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Thu Feb 18 15:28:45 2016 +0530

----------------------------------------------------------------------
 test/integration/testpaths/testpath_volume_snapshot.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------