Signed-off-by: Lucas Meneghel Rodrigues<[email protected]>
---
client/tests/kvm/control | 6 +++---
client/tests/kvm/control.spice | 6 +++---
client/tests/kvm/control.unittests | 4 ++--
client/tests/libvirt/control | 4 ++--
client/tests/virt_v2v/control | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/client/tests/kvm/control b/client/tests/kvm/control
index bbaa5ec..ee8d57b 100644
--- a/client/tests/kvm/control
+++ b/client/tests/kvm/control
@@ -22,7 +22,7 @@ For online docs, please refer to
http://www.linux-kvm.org/page/KVM-Autotest
import sys, os, logging
from autotest.client.shared import cartesian_config
-from autotest.client.virt import virt_utils
+from autotest.client.virt import utils_misc
# set English environment (command output might be localized, need to be safe)
os.environ['LANG'] = 'en_US.UTF-8'
@@ -37,7 +37,7 @@ parser = cartesian_config.Parser()
kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
parser.parse_file(os.path.join(kvm_test_dir, "build.cfg"))
parser.parse_string(str)
-if not virt_utils.run_tests(parser, job):
+if not utils_misc.run_tests(parser, job):
logging.error("KVM build step failed, exiting.")
sys.exit(1)
@@ -66,4 +66,4 @@ if args:
pass
parser.parse_string(str)
-virt_utils.run_tests(parser, job)
+utils_misc.run_tests(parser, job)
diff --git a/client/tests/kvm/control.spice b/client/tests/kvm/control.spice
index 2766b09..0133b33 100644
--- a/client/tests/kvm/control.spice
+++ b/client/tests/kvm/control.spice
@@ -15,7 +15,7 @@ For online docs, please refer to
http://www.linux-kvm.org/page/KVM-Autotest
import sys, os, logging
from autotest.client.shared import cartesian_config
-from autotest.client.virt import virt_utils
+from autotest.client.virt import utils_misc
# set English environment (command output might be localized, need to be safe)
os.environ['LANG'] = 'en_US.UTF-8'
@@ -30,7 +30,7 @@ parser = cartesian_config.Parser()
kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
parser.parse_file(os.path.join(kvm_test_dir, "build.cfg"))
parser.parse_string(str)
-if not virt_utils.run_tests(parser, job):
+if not utils_misc.run_tests(parser, job):
logging.error("KVM build step failed, exiting.")
sys.exit(1)
@@ -59,4 +59,4 @@ if args:
pass
parser.parse_string(str)
-virt_utils.run_tests(parser, job)
+utils_misc.run_tests(parser, job)
diff --git a/client/tests/kvm/control.unittests
b/client/tests/kvm/control.unittests
index efc91b7..a327645 100644
--- a/client/tests/kvm/control.unittests
+++ b/client/tests/kvm/control.unittests
@@ -15,7 +15,7 @@ Runs the unittests available for a given KVM build.
import sys, os, logging
from autotest.client.shared import cartesian_config
-from autotest.client.virt import virt_utils
+from autotest.client.virt import utils_misc
parser = cartesian_config.Parser()
kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
@@ -23,4 +23,4 @@ tests_cfg_path = os.path.join(kvm_test_dir, "unittests.cfg")
parser.parse_file(tests_cfg_path)
# Run the tests
-virt_utils.run_tests(parser, job)
+utils_misc.run_tests(parser, job)
diff --git a/client/tests/libvirt/control b/client/tests/libvirt/control
index 05ad865..e64a7c9 100644
--- a/client/tests/libvirt/control
+++ b/client/tests/libvirt/control
@@ -17,7 +17,7 @@ libvirt code.
import sys, os, logging
from autotest.client.shared import cartesian_config
-from autotest.client.virt import virt_utils
+from autotest.client.virt import utils_misc
# set English environment (command output might be localized, need to be safe)
os.environ['LANG'] = 'en_US.UTF-8'
@@ -27,4 +27,4 @@ libvirt_test_dir =
os.path.join(os.environ['AUTODIR'],'tests/libvirt')
parser = cartesian_config.Parser()
parser.parse_file(os.path.join(libvirt_test_dir, "tests.cfg"))
-virt_utils.run_tests(parser, job)
+utils_misc.run_tests(parser, job)
diff --git a/client/tests/virt_v2v/control b/client/tests/virt_v2v/control
index 93bd80d..b298a4c 100644
--- a/client/tests/virt_v2v/control
+++ b/client/tests/virt_v2v/control
@@ -16,7 +16,7 @@ on virt-v2v code.
import sys, os, logging
from autotest.client.shared import cartesian_config
-from autotest.client.virt import virt_utils
+from autotest.client.virt import utils_misc
# set English environment (command output might be localized, need to be safe)
os.environ['LANG'] = 'en_US.UTF-8'
@@ -32,10 +32,10 @@ v2v_test_dir =
os.path.join(os.environ['AUTODIR'],'tests/virt_v2v')
# parser.parse_file(os.path.join(v2v_test_dir, "build.cfg"))
# parser.parse_string(str)
-# if not virt_utils.run_tests(parser, job):
+# if not utils_misc.run_tests(parser, job):
# logging.error("Virt-v2v build step failed, exiting.")
# sys.exit(1)
parser.parse_file(os.path.join(v2v_test_dir, "tests.cfg"))
-virt_utils.run_tests(parser, job)
+utils_misc.run_tests(parser, job)
