From 678609610f4ccbcb19438cbce5d84bd376010596 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 30 Jun 2017 06:24:11 +0200 Subject: Define console_scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only prepare_env.py and run_tests.py remain executable to avoid breaking the gate. As soon as the jenkins jobs are updated to run them from $PATH, tox will be updated to protect against chmod a+x py files. Dockerfile will be simplified as well. Change-Id: Iac1a7ceb6b344e800177226ea39919826f6d3735 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/vping/vping_userdata.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) mode change 100755 => 100644 functest/opnfv_tests/openstack/vping/vping_userdata.py (limited to 'functest/opnfv_tests/openstack/vping/vping_userdata.py') diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py old mode 100755 new mode 100644 index 718f47f0d..9aed4c10a --- a/functest/opnfv_tests/openstack/vping/vping_userdata.py +++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py @@ -7,17 +7,14 @@ # # http://www.apache.org/licenses/LICENSE-2.0 -import argparse -import sys import time -from functest.core.testcase import TestCase - from snaps.openstack.utils import deploy_utils from snaps.openstack.create_instance import VmInstanceSettings from snaps.openstack.create_network import PortSettings -import vping_base +from functest.core.testcase import TestCase +from functest.opnfv_tests.openstack.vping import vping_base class VPingUserdata(vping_base.VPingBase): @@ -142,13 +139,3 @@ def _get_userdata(test_ip): " sleep 1\n" "done\n" % test_ip) return None - - -if __name__ == '__main__': - args_parser = argparse.ArgumentParser() - args_parser.add_argument("-r", "--report", - help="Create json result file", - action="store_true") - args = vars(args_parser.parse_args()) - - sys.exit(vping_base.VPingMain(VPingUserdata).main(**args)) -- cgit 1.2.3-korg