From 678609610f4ccbcb19438cbce5d84bd376010596 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
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 <cedric.ollivier@orange.com>
---
 functest/opnfv_tests/openstack/refstack_client/refstack_client.py | 6 +++---
 functest/opnfv_tests/openstack/refstack_client/tempest_conf.py    | 2 +-
 2 files changed, 4 insertions(+), 4 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

(limited to 'functest/opnfv_tests/openstack/refstack_client')

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 c46188947..9edbab5a1
--- 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 5d429e7c2..30590b9eb
--- 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()
-- 
cgit 1.2.3-korg