Rename autotest_utils to utils
Fixes longstanding hangover ugliness from the original change away
from doing "from autotest_utils import *".
Signed-off-by: Martin J. Bligh <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2595 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/harness_ABAT.py b/client/bin/harness_ABAT.py
index 8e22f98..91d3f1e 100755
--- a/client/bin/harness_ABAT.py
+++ b/client/bin/harness_ABAT.py
@@ -5,8 +5,7 @@
__author__ = """Copyright Andy Whitcroft 2006"""
-from autotest_lib.client.bin import autotest_utils
-from autotest_lib.client.common_lib import utils
+from autotest_lib.client.bin import utils
import os, harness, time, re
def autobench_load(fn):
@@ -117,7 +116,7 @@
# For RedHat installs we do not load up the module.conf
# as they cannot be builtin. Pass them as arguments.
- vendor = autotest_utils.get_os_vendor()
+ vendor = utils.get_os_vendor()
if vendor in ['Red Hat', 'Fedora Core'] and 'modules' in conf:
args = '--allow-missing'
for mod in conf['modules']:
