Change in vdsm[master]: tests/functional: Remove storage tests references from virtT...

mzamazal at redhat.com mzamazal at redhat.com
Mon Apr 11 15:23:35 UTC 2016


Milan Zamazal has uploaded a new change for review.

Change subject: tests/functional: Remove storage tests references from virtTests
......................................................................

tests/functional: Remove storage tests references from virtTests

tests/functional/storageTests.py has been removed in commit df5ebfd0,
causing breakage of virtTests.py functional tests due to the references
to that file.  This patch removes those references, thus making
tests/functional/virtTests.py working again.

Change-Id: I8e3e499c51cb20fb2cc583afb88744aa90ced7a8
Signed-off-by: Milan Zamazal <mzamazal at redhat.com>
---
M tests/functional/virtTests.py
1 file changed, 2 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/55983/1

diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py
index d847c5e..adb6dec 100644
--- a/tests/functional/virtTests.py
+++ b/tests/functional/virtTests.py
@@ -35,9 +35,8 @@
 import verify
 
 from vdsm import cpuarch
-from vdsm.utils import CommandPath, RollbackContext
+from vdsm.utils import CommandPath
 from vdsm.virt import vmstatus
-import storageTests as storage
 from storage.misc import execCmd
 
 from utils import getProxy, SUCCESS
@@ -285,32 +284,12 @@
             self._waitForStartup(vm, VM_MINIMAL_UPTIME)
 
     @requireKVM
-    @permutations([['localfs'], ['iscsi'], ['nfs']])
-    def testVmWithStorage(self, backendType):
-        disk = storage.StorageTest()
-        disk.setUp()
-        conf = storage.storageLayouts[backendType]
-        drives = disk.generateDriveConf(conf)
-        customization = {'vmId': '88888888-eeee-ffff-aaaa-111111111111',
-                         'vmName': 'testVmWithStorage' + backendType,
-                         'drives': drives,
-                         'display': _GRAPHICS_FOR_ARCH[platform.machine()]}
-
-        with RollbackContext() as rollback:
-            disk.createVdsmStorageLayout(conf, 3, rollback)
-            with RunningVm(self.vdsm, customization) as vm:
-                self._waitForStartup(vm, VM_MINIMAL_UPTIME)
-                self._verifyDevices(vm)
-
-    @requireKVM
     @permutations([['hotplugNic'], ['virtioNic'], ['smartcard'],
                    ['hotplugDisk'], ['virtioRng']])
     def testVmWithDevice(self, *devices):
         customization = {'vmId': '77777777-ffff-3333-bbbb-222222222222',
                          'vmName': 'testVm', 'devices': [],
                          'display': _GRAPHICS_FOR_ARCH[platform.machine()]}
-        storageLayout = storage.storageLayouts['localfs']
-        diskSpecs = storage.StorageTest.generateDriveConf(storageLayout)
         pciSpecs = {'bus': '0x00', 'domain': '0x0000',
                     'function': '0x0', 'type': 'pci'}
         ccidSpecs = {'slot': '0', 'controller': '0', 'type': 'ccid'}
@@ -337,8 +316,7 @@
                                    'alias': 'smartcard', 'specParams':
                                    {'type': 'spicevmc',
                                     'mode': 'passthrough'}},
-                     'hotplugDisk': {'vmId': customization['vmId'],
-                                     'drive': diskSpecs}}
+                     'hotplugDisk': {'vmId': customization['vmId']}}
 
         if 'virtioRng' in devices:
             status, msg, caps = self.vdsm.getVdsCapabilities()


-- 
To view, visit https://gerrit.ovirt.org/55983
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e3e499c51cb20fb2cc583afb88744aa90ced7a8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Milan Zamazal <mzamazal at redhat.com>


More information about the vdsm-patches mailing list