From 0efb6a52cc73e4f32a82505ca7e58fc73ea2e55f Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 3 Nov 2016 17:06:18 +0100 Subject: [PATCH] Do not modify unix rights in case of unit tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Even if the unit tests define main, nosetests oblige by default to remove their executable bit. It also fixes the unix rights of Sfc.py. Change-Id: Icbbb5b3118b16eff75b13d927e674a9764d6d83f Signed-off-by: Cédric Ollivier --- docker/Dockerfile | 3 ++- testcases/Controllers/ONOS/Sfc/Sfc.py | 0 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 testcases/Controllers/ONOS/Sfc/Sfc.py diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ff0f4f62..fd37e42fd 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 old mode 100644 new mode 100755 -- 2.16.6