summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-11-08 13:45:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-08 13:45:56 +0000
commit5e338c827e775763232e3f427e4b69b96ebdc8ba (patch)
tree52e609341d08d3f962c40bebf53c106a4d421432
parentf300775db92443428e32c3b3da20b5761cfcfac0 (diff)
parent0efb6a52cc73e4f32a82505ca7e58fc73ea2e55f (diff)
Merge "Do not modify unix rights in case of unit tests"
-rw-r--r--docker/Dockerfile3
-rwxr-xr-x[-rw-r--r--]testcases/Controllers/ONOS/Sfc/Sfc.py0
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bb873b351..c5553d9dc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -107,7 +107,8 @@ RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
RUN pip install -r ${repos_dir}/rally/requirements.txt
RUN pip install -r ${repos_dir}/tempest/requirements.txt
-RUN find ${repos_dir}/functest -name "*.py" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755
+RUN find ${repos_dir}/functest -name "*.py" \
+ -not -path *unit_tests* |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755
RUN find ${repos_dir}/functest -name "*.sh" |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
RUN /bin/bash ${repos_dir}/parser/tests/parser_install.sh ${repos_dir}
diff --git a/testcases/Controllers/ONOS/Sfc/Sfc.py b/testcases/Controllers/ONOS/Sfc/Sfc.py
index bea2828d2..bea2828d2 100644..100755
--- a/testcases/Controllers/ONOS/Sfc/Sfc.py
+++ b/testcases/Controllers/ONOS/Sfc/Sfc.py