CLOUDSTACK-4225: list the snapshot path on secondary store list the snapshot on secondary store. avoid changing directories and additional debug commands.
Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b66677d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b66677d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b66677d Branch: refs/heads/4.2 Commit: 5b66677d742fa057779f56c3f4c7a905d8a3d4c5 Parents: 8b922b8 Author: Prasanna Santhanam <t...@apache.org> Authored: Tue Aug 20 19:38:59 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Tue Aug 20 19:38:59 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_snapshot_gc.py | 6 ++---- test/integration/component/test_snapshot_limits.py | 6 ++---- test/integration/component/test_snapshots.py | 9 +++------ 3 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b66677d/test/integration/component/test_snapshot_gc.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_snapshot_gc.py b/test/integration/component/test_snapshot_gc.py index d9af966..2300e45 100644 --- a/test/integration/component/test_snapshot_gc.py +++ b/test/integration/component/test_snapshot_gc.py @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. -import marvin from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * @@ -23,6 +22,7 @@ from marvin.integration.lib.utils import * from marvin.integration.lib.base import * from marvin.integration.lib.common import * from marvin.remoteSSHClient import remoteSSHClient +import os class Services: @@ -263,10 +263,8 @@ class TestAccountSnapshotClean(cloudstackTestCase): path, self.services["paths"]["mount_dir"] ), - "cd %s" % self.services["paths"]["mount_dir"], - "ls -Rt", "ls %s" % ( - snapshotPath + os.path.join(self.services["paths"]["mount_dir"], snapshotPath) ), ] http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b66677d/test/integration/component/test_snapshot_limits.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py index 52d9189..a530a04 100644 --- a/test/integration/component/test_snapshot_limits.py +++ b/test/integration/component/test_snapshot_limits.py @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. -import marvin from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * @@ -23,6 +22,7 @@ from marvin.integration.lib.utils import * from marvin.integration.lib.base import * from marvin.integration.lib.common import * from marvin.remoteSSHClient import remoteSSHClient +import os class Services: @@ -251,10 +251,8 @@ class TestSnapshotLimit(cloudstackTestCase): path, self.services["paths"]["mount_dir"] ), - "cd %s" % self.services["paths"]["mount_dir"], - "ls -Rt", "ls %s" % ( - snapshotPath + os.path.join(self.services["paths"]["mount_dir"], snapshotPath) ), ] http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b66677d/test/integration/component/test_snapshots.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py index 2eccf49..071702b 100644 --- a/test/integration/component/test_snapshots.py +++ b/test/integration/component/test_snapshots.py @@ -24,6 +24,7 @@ from marvin.integration.lib.utils import * from marvin.integration.lib.base import * from marvin.integration.lib.common import * from marvin.remoteSSHClient import remoteSSHClient +import os class Services: @@ -243,10 +244,8 @@ class TestSnapshots(cloudstackTestCase): path, self.services["paths"]["mount_dir"] ), - "cd %s" % self.services["paths"]["mount_dir"], - "ls -Rt", "ls %s" % ( - snapshotPath + os.path.join(self.services["paths"]["mount_dir"], snapshotPath) ), ] @@ -1050,10 +1049,8 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase): path, self.services["paths"]["mount_dir"] ), - "cd %s" % self.services["paths"]["mount_dir"], - "ls -Rt", "ls %s" % ( - snapshotPath + os.path.join(self.services["paths"]["mount_dir"], snapshotPath) ), ]
