Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
client/tests/kvm/tests-shared.cfg.sample | 2 +-
contrib/virt/control.template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/client/tests/kvm/tests-shared.cfg.sample
b/client/tests/kvm/tests-shared.cfg.sample
index fb87876..b8d930e 100644
--- a/client/tests/kvm/tests-shared.cfg.sample
+++ b/client/tests/kvm/tests-shared.cfg.sample
@@ -33,7 +33,7 @@ other_tests_dirs = ""
# (for example, the cdrom share can be read only)
image_name(_.*)? ?<= /tmp/kvm_autotest_root/images/
cdrom(_.*)? ?<= /tmp/kvm_autotest_root/
-floppy ?<= /tmp/kvm_autotest_root/
+floppy(_.*)? ?<= /tmp/kvm_autotest_root/
Linux..unattended_install:
kernel ?<= /tmp/kvm_autotest_root/
initrd ?<= /tmp/kvm_autotest_root/
diff --git a/contrib/virt/control.template b/contrib/virt/control.template
index d2858df..df90ab3 100644
--- a/contrib/virt/control.template
+++ b/contrib/virt/control.template
@@ -9,7 +9,7 @@ os.environ['LANG'] = 'en_US.UTF-8'
kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests', 'kvm')
sys.path.append(kvm_test_dir)
from autotest.client.shared import cartesian_config
-from autotest.client.virt import virt_utils
+from autotest.client.virt import utils_misc
kernel_install_params = %s
custom_cfg = %s
@@ -19,7 +19,7 @@ def step_init():
job.next_step([step_test])
if kernel_install:
try:
- virt_utils.install_host_kernel(job, kernel_install_params)
+ utils_misc.install_host_kernel(job, kernel_install_params)
except Exception, details:
job.record('FAIL', None, 'host kernel install (client)',
str(details))
@@ -28,7 +28,7 @@ def step_test():
parser.parse_file(os.path.join(kvm_test_dir, "redhat.cfg"))
for line in custom_cfg:
parser.parse_string(line)
- virt_utils.run_tests(parser, job)
+ utils_misc.run_tests(parser, job)
''' % (params, custom_cfg, kernel_install)
return control
--
1.7.11.4
_______________________________________________
Autotest-kernel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/autotest-kernel
