diff --git a/test/integration/component/test_snapshot_gc.py b/test/integration/component/test_snapshot_gc.py index d9af96677de..2300e45b5bc 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) ), ] diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py index 52d9189e8d2..a530a043e4d 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) ), ] diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py index 2eccf4946ba..071702b82f6 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) ), ]