From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 343C411D4 for ; Fri, 11 Aug 2017 04:20:39 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Aug 2017 19:20:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,356,1498546800"; d="scan'208";a="122358031" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by orsmga002.jf.intel.com with ESMTP; 10 Aug 2017 19:20:38 -0700 From: Fangfang Wei To: dts@dpdk.org Cc: fangfangwei Date: Fri, 11 Aug 2017 10:21:55 +0800 Message-Id: <1502418115-63425-1-git-send-email-fangfangx.wei@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] fix virt conf path issue in framework X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Aug 2017 02:20:40 -0000 From: fangfangwei It missed slash for virt conf path. Signed-off-by: fangfangwei --- framework/virt_base.py | 3 ++- framework/virt_scene.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/virt_base.py b/framework/virt_base.py index 78e3334..1838ca1 100644 --- a/framework/virt_base.py +++ b/framework/virt_base.py @@ -28,6 +28,7 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +import os import sys import traceback from random import randint @@ -128,7 +129,7 @@ class VirtBase(object): Load local configure in the path DTS_ROOT_PATH/conf. """ # load local configuration by suite and vm name - conf = VirtConf(CONFIG_ROOT_PATH + suite_name + '.cfg') + conf = VirtConf(CONFIG_ROOT_PATH + os.sep + suite_name + '.cfg') conf.load_virt_config(self.vm_name) local_conf = conf.get_virt_config() # replace global configurations with local configurations diff --git a/framework/virt_scene.py b/framework/virt_scene.py index fd7497d..5fead7e 100644 --- a/framework/virt_scene.py +++ b/framework/virt_scene.py @@ -77,7 +77,7 @@ class VirtScene(object): def load_config(self): try: self.vm_confs = {} - conf = VirtConf(CONFIG_ROOT_PATH + 'scene/' + self.name + '.cfg') + conf = VirtConf(CONFIG_ROOT_PATH + '/scene/' + self.name + '.cfg') self.sections = conf.virt_conf.get_sections() for vm in self.sections: conf.load_virt_config(vm) -- 2.7.4