openstack
/
neutron
Code Issues Proposed changes

Prioritize tox environment executables for fullstack/functional tests 

Otherwise tests will use executables from global paths (f.e. /usr/bin/)
when those are available, which doesn't play well with a system that has
devstack installed.

Conflicts:
      tools/deploy_rootwrap.sh

Change-Id: I3213d5cb570b09d5049b7087cd710337e2698eb3
(cherry picked from commit a77fb4ec26)
This commit is contained in:
Ihar Hrachyshka 2017-08-28 19:38:23 +00:00
parent 92f0240946
commit 308feb16ce
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deploy_rootwrap.sh
View File

@ -48,7 +48,7 @@ mkdir -p -m 755 ${dst_rootwrap_path}
cp -p ${src_rootwrap_path}/* ${dst_rootwrap_path}/
cp -p ${src_conf} ${dst_conf}
sed -i "s:^filters_path=.*$:filters_path=${dst_rootwrap_path}:" ${dst_conf}
sed -i "s:^\(exec_dirs=.*\)$:\1,${target_bin_path}:" ${dst_conf}
sed -i "s:^exec_dirs=\(.*\)$:exec_dirs=${target_bin_path},\1:" ${dst_conf}
if [[ "$OS_SUDO_TESTING" = "1" ]]; then
sed -i 's/use_syslog=False/use_syslog=True/g' ${dst_conf}