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/utils/openstack_clean.py    | 7 +------
 functest/utils/openstack_snapshot.py | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 functest/utils/openstack_clean.py
 mode change 100755 => 100644 functest/utils/openstack_snapshot.py

(limited to 'functest/utils')

diff --git a/functest/utils/openstack_clean.py b/functest/utils/openstack_clean.py
old mode 100755
new mode 100644
index e88245d61..d7df8f848
--- a/functest/utils/openstack_clean.py
+++ b/functest/utils/openstack_clean.py
@@ -23,7 +23,6 @@
 #
 
 import logging
-import sys
 import time
 import yaml
 
@@ -382,6 +381,7 @@ def remove_tenants(keystone_client, default_tenants):
 
 
 def main():
+    logging.basicConfig()
     logger.info("Cleaning OpenStack resources...")
 
     nova_client = os_utils.get_nova_client()
@@ -430,8 +430,3 @@ def main():
     remove_tenants(keystone_client, default_tenants)
     separator()
     return 0
-
-
-if __name__ == '__main__':
-    logging.basicConfig()
-    sys.exit(main())
diff --git a/functest/utils/openstack_snapshot.py b/functest/utils/openstack_snapshot.py
old mode 100755
new mode 100644
index f4ef751c6..3dc6f80c7
--- a/functest/utils/openstack_snapshot.py
+++ b/functest/utils/openstack_snapshot.py
@@ -22,7 +22,6 @@
 
 import logging
 import yaml
-import sys
 
 import functest.utils.openstack_utils as os_utils
 from functest.utils.constants import CONST
@@ -131,6 +130,7 @@ def get_tenants(keystone_client):
 
 
 def main():
+    logging.basicConfig()
     logger.info("Generating OpenStack snapshot...")
 
     nova_client = os_utils.get_nova_client()
@@ -163,8 +163,3 @@ def main():
         logger.debug("NOTE: These objects will NOT be deleted after " +
                      "running the test.")
     return 0
-
-
-if __name__ == '__main__':
-    logging.basicConfig()
-    sys.exit(main())
-- 
cgit 1.2.3-korg