From 115ea9be50aee7db38d92399bc2d46a60e1d7e2d Mon Sep 17 00:00:00 2001 From: Lukasz Pawlik Date: Wed, 4 Sep 2019 11:17:26 +0100 Subject: integration: Fix OVSDPDK tests Commit c5a075eafc322d9ae62322e90ab4e232df176743 break integration tests because logs location was changed. This patch fix this by ensuring that RESULTS_PATH is set before integration tests conf file is processed and set correct path in integration conf. Signed-off-by: Lukasz Pawlik Change-Id: I7ca104cfb31c7bc0f6052b58a370a1d65157efe1 --- vswitches/ovs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'vswitches') diff --git a/vswitches/ovs.py b/vswitches/ovs.py index e713fc38..853bef85 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -47,13 +47,12 @@ class IVSwitchOvs(IVSwitch, tasks.Process): """See IVswitch for general description """ super().__init__() + name, ext = os.path.splitext(settings.getValue('LOG_FILE_VSWITCHD')) rename_vswitchd = "{name}_{uid}{ex}".format(name=name, - uid=settings.getValue( - 'LOG_TIMESTAMP'), + uid=settings.getValue('LOG_TIMESTAMP'), ex=ext) - self._logfile = os.path.join(settings.getValue('RESULTS_PATH'), - rename_vswitchd) + self._logfile = os.path.join(settings.getValue('RESULTS_PATH'), rename_vswitchd) self._ovsdb_pidfile_path = os.path.join(settings.getValue('TOOLS')['ovs_var_tmp'], "ovsdb-server.pid") self._vswitchd_pidfile_path = os.path.join(settings.getValue('TOOLS')['ovs_var_tmp'], -- cgit 1.2.3-korg