You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2013/12/11 07:41:52 UTC
git commit: updated refs/heads/4.2-forward to 1409ef0
Updated Branches:
refs/heads/4.2-forward 1efd544ee -> 1409ef03a
Fixed an issue reported by xen server team.
Added a temp time sleep fix for a start command. Applies only to 4.2-forward branch.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1409ef03
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1409ef03
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1409ef03
Branch: refs/heads/4.2-forward
Commit: 1409ef03af3f9dede162c103b56171ecd83edc92
Parents: 1efd544
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Wed Dec 11 12:10:57 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Dec 11 12:10:57 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_snapshots.py | 4 ++--
test/integration/smoke/test_volumes.py | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1409ef03/test/integration/smoke/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
index 06777e4..b8c30b0 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -272,7 +272,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
# Get the Secondary Storage details from list Hosts
hosts = list_hosts(
self.apiclient,
- type='SecondaryStorage',
+ type='SecondaryStorageVM',
zoneid=self.zone.id
)
self.assertEqual(
@@ -342,4 +342,4 @@ class TestSnapshotRootDisk(cloudstackTestCase):
1,
"Check snapshot UUID in secondary storage and database"
)
- return
\ No newline at end of file
+ return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1409ef03/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index b60b70e..2c0d6ae 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -621,6 +621,8 @@ class TestVolumes(cloudstackTestCase):
)
if hosts[0].hypervisor == "XenServer":
self.virtual_machine.start(self.apiClient)
+ time.sleep(30)
+ return
@attr(tags = ["advanced", "advancedns", "smoke", "basic"])
@@ -680,6 +682,8 @@ class TestVolumes(cloudstackTestCase):
if hosts[0].hypervisor == "XenServer":
self.virtual_machine.start(self.apiClient)
+ time.sleep(30)
+ return
@attr(tags = ["advanced", "advancedns", "smoke","basic"])
def test_09_delete_detached_volume(self):