summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2015-12-09 14:32:06 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2015-12-14 14:44:39 +0000
commitad35451e9bb63a551b0b1ff517706b969653f594 (patch)
tree95042c99b2c998275914b768840d8d63e0094591
parent088c895dc2363bd0b586a2ddfeebf13f6755ee4e (diff)
bugfix: Support paths with user's home shortcut
VSPERF will explicitly expand any '~' to the absolute path to the user's home directory before call of subsystem.Popen method. Only calls, which process configuration values are modified. Change-Id: Ibd9399ae84bf4698c86bf8eff97ca6ce785fb3fb JIRA: VSPERF-45 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com> Reviewed-by: Al Morton <acmorton@att.com>
-rw-r--r--src/dpdk/dpdk.py2
-rw-r--r--tools/pkt_gen/testcenter/testcenter.py2
-rw-r--r--tools/tasks.py7
3 files changed, 6 insertions, 5 deletions
diff --git a/src/dpdk/dpdk.py b/src/dpdk/dpdk.py
index 85d0001e..3f5333a0 100644
--- a/src/dpdk/dpdk.py
+++ b/src/dpdk/dpdk.py
@@ -296,7 +296,7 @@ def _unbind_nics_get_driver():
after unbinding them from DPDK.
"""
_driver_list = []
- _output = subprocess.check_output([RTE_PCI_TOOL, '--status'])
+ _output = subprocess.check_output([os.path.expanduser(RTE_PCI_TOOL), '--status'])
_my_encoding = locale.getdefaultlocale()[1]
for line in _output.decode(_my_encoding).split('\n'):
for nic in settings.getValue('WHITELIST_NICS'):
diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py
index 4ba5bc89..f670612c 100644
--- a/tools/pkt_gen/testcenter/testcenter.py
+++ b/tools/pkt_gen/testcenter/testcenter.py
@@ -127,7 +127,7 @@ class TestCenter(trafficgen.ITrafficGenerator):
verbose = True
print("Arguments used to call test: %s" % args)
- subprocess.check_call(args)
+ subprocess.check_call(map(os.path.expanduser, args))
file = os.path.join(settings.getValue("TRAFFICGEN_STC_RESULTS_DIR"),
settings.getValue("TRAFFICGEN_STC_CSV_RESULTS_FILE_PREFIX") + ".csv")
diff --git a/tools/tasks.py b/tools/tasks.py
index 33a5931a..09dd88dd 100644
--- a/tools/tasks.py
+++ b/tools/tasks.py
@@ -75,8 +75,9 @@ def run_task(cmd, logger, msg=None, check_error=False):
logger.debug('%s%s', CMD_PREFIX, ' '.join(cmd))
try:
- proc = subprocess.Popen(
- cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=0)
+ proc = subprocess.Popen(map(os.path.expanduser, cmd),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE, bufsize=0)
while True:
reads = [proc.stdout.fileno(), proc.stderr.fileno()]
@@ -121,7 +122,7 @@ def run_background_task(cmd, logger, msg):
logger.info(msg)
logger.debug('%s%s', CMD_PREFIX, ' '.join(cmd))
- proc = subprocess.Popen(cmd, stdout=_get_stdout(), bufsize=0)
+ proc = subprocess.Popen(map(os.path.expanduser, cmd), stdout=_get_stdout(), bufsize=0)
return proc.pid