From patchwork Tue Jun 9 16:33:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 29044 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n59GXdIH022962 for ; Tue, 9 Jun 2009 16:33:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755592AbZFIQde (ORCPT ); Tue, 9 Jun 2009 12:33:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755412AbZFIQde (ORCPT ); Tue, 9 Jun 2009 12:33:34 -0400 Received: from mx2.redhat.com ([66.187.237.31]:45322 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755296AbZFIQde (ORCPT ); Tue, 9 Jun 2009 12:33:34 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n59GXa2l000338; Tue, 9 Jun 2009 12:33:36 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n59GXZ66004142; Tue, 9 Jun 2009 12:33:35 -0400 Received: from localhost.localdomain (vpn-10-103.bos.redhat.com [10.16.10.103]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n59GXVmH000563; Tue, 9 Jun 2009 12:33:33 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [KVM-AUTOTEST PATCH 2/4] Make kvm_config.py to use internal/standard exeptions Date: Tue, 9 Jun 2009 13:33:27 -0300 Message-Id: <1244565209-9132-2-git-send-email-lmr@redhat.com> In-Reply-To: <1244565209-9132-1-git-send-email-lmr@redhat.com> References: <1244565209-9132-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Instead of resorting to internal autotest exception types, use either python standard exceptions or an internally defined ConfigError exception. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/kvm_config.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/tests/kvm/kvm_config.py b/client/tests/kvm/kvm_config.py index a3467a0..cce931a 100755 --- a/client/tests/kvm/kvm_config.py +++ b/client/tests/kvm/kvm_config.py @@ -8,6 +8,11 @@ KVM configuration file utility functions. @copyright: Red Hat 2008-2009 """ + +class ConfigError(Exception): + pass + + class config: """ Parse an input file or string that follows the KVM Test Config File format @@ -47,7 +52,7 @@ class config: @param filename: Path of the configuration file. """ if not os.path.exists(filename): - raise Exception, "File %s not found" % filename + raise IOError("File %s not found" % filename) self.filename = filename file = open(filename, "r") self.list = self.parse(file, self.list) @@ -357,7 +362,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 ConfigError(e_msg) if self.debug and not restricted: self.__debug_print(indented_line, "Entering variants block (%d dicts in" @@ -402,7 +407,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 ConfigError(e_msg) new_file = open(filename, "r") list = self.parse(new_file, list, restricted) new_file.close() @@ -410,7 +415,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 ConfigError(e_msg) # Parse multi-line exceptions # (the block is parsed for each dict separately)