@@ -1,5 +1,4 @@
import re, os, sys, StringIO
-from autotest_lib.client.common_lib import error
"""
KVM configuration file utility functions.
@@ -356,7 +355,7 @@ class config:
# (inside an exception or inside subvariants)
if restricted:
e_msg = "Using variants in this context is not allowed"
- raise error.AutotestError()
+ raise ValueError(e_msg)
if self.debug and not restricted:
self.__debug_print(indented_line,
"Entering variants block (%d dicts in"
@@ -401,7 +400,7 @@ class config:
words[1])
if not os.path.exists(filename):
e_msg = "Cannot include %s -- file not found" % filename
- raise error.AutotestError(e_msg)
+ raise IOError(e_msg)
new_file = open(filename, "r")
list = self.parse(new_file, list, restricted)
new_file.close()
@@ -409,7 +408,7 @@ class config:
self.__debug_print("", "Leaving file %s" % words[1])
else:
e_msg = "Cannot include anything because no file is open"
- raise error.AutotestError(e_msg)
+ raise ValueError(e_msg)
# Parse multi-line exceptions
# (the block is parsed for each dict separately)
Replace autotest exceptions for standard python exceptions. This will allow kvm_config.py to be used as a stand alone program. Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> --- client/tests/kvm/kvm_config.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)