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 --- .../openstack/refstack_client/refstack_client.py | 6 +++--- .../openstack/refstack_client/tempest_conf.py | 2 +- functest/opnfv_tests/openstack/vping/vping_ssh.py | 2 +- functest/opnfv_tests/openstack/vping/vping_userdata.py | 17 ++--------------- functest/opnfv_tests/sdn/onos/sfc/sfc.py | 6 +----- 5 files changed, 8 insertions(+), 25 deletions(-) mode change 100755 => 100644 functest/opnfv_tests/openstack/refstack_client/refstack_client.py mode change 100755 => 100644 functest/opnfv_tests/openstack/refstack_client/tempest_conf.py mode change 100755 => 100644 functest/opnfv_tests/openstack/vping/vping_ssh.py mode change 100755 => 100644 functest/opnfv_tests/openstack/vping/vping_userdata.py mode change 100755 => 100644 functest/opnfv_tests/sdn/onos/sfc/sfc.py (limited to 'functest/opnfv_tests') diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py old mode 100755 new mode 100644 index c4618894..9edbab5a --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -218,7 +218,7 @@ class RefstackClientParser(object): return vars(self.parser.parse_args(argv)) -if __name__ == '__main__': +def main(): logging.basicConfig() refstackclient = RefstackClient() parser = RefstackClientParser() @@ -226,6 +226,6 @@ if __name__ == '__main__': try: result = refstackclient.main(**args) if result != testcase.TestCase.EX_OK: - sys.exit(result) + return result except Exception: - sys.exit(testcase.TestCase.EX_RUN_ERROR) + return testcase.TestCase.EX_RUN_ERROR diff --git a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py old mode 100755 new mode 100644 index 5d429e7c..30590b9e --- a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py +++ b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py @@ -49,7 +49,7 @@ class TempestConf(object): logger.error('Error with run: %s', e) -if __name__ == '__main__': +def main(): logging.basicConfig() tempestconf = TempestConf() tempestconf.main() diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py old mode 100755 new mode 100644 index eacccb98..d4c39ad2 --- a/functest/opnfv_tests/openstack/vping/vping_ssh.py +++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py @@ -23,8 +23,8 @@ from snaps.openstack.utils import deploy_utils from functest.core.testcase import TestCase from functest.opnfv_tests.openstack.snaps import snaps_utils +from functest.opnfv_tests.openstack.vping import vping_base from functest.utils.constants import CONST -import vping_base class VPingSSH(vping_base.VPingBase): 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 718f47f0..9aed4c10 --- 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)) diff --git a/functest/opnfv_tests/sdn/onos/sfc/sfc.py b/functest/opnfv_tests/sdn/onos/sfc/sfc.py old mode 100755 new mode 100644 index a2dd7e9a..2bb9082c --- a/functest/opnfv_tests/sdn/onos/sfc/sfc.py +++ b/functest/opnfv_tests/sdn/onos/sfc/sfc.py @@ -165,14 +165,10 @@ def PushDB(status, info): def main(): """Script to Test the SFC scenarios in ONOS.""" + logging.basicConfig() PreConfig() CreateNodes() ConfigSfc() VerifySfcTraffic() CleanUp() PushDB("PASS", "") - - -if __name__ == '__main__': - logging.basicConfig() - main() -- cgit 1.2.3-korg