commit ab33302bd961daab5386f87779cf755530ce821a
author caoyue <yue.cao@easystack.cn> Mon Jan 25 16:45:21 2016 +0800
committer Jordan Pittier <jordan.pittier@scality.com> Mon Jan 25 12:23:39 2016 +0000
tree 3f9fe73b85ea67440828ad17b5336833a1379b00
parent 545e8f00d207b637407e3080c0aabff4b4426d5a

Replace exit() by sys.exit()

exit() is used for interactive shell, it relies on the site module.
sys.exit() is considered good to use in programs.

Trivial-fix

Change-Id: I9e6e7a53581abefbb6cc3ba6ee6b853cd430d456

tempest/cmd/verify_tempest_config.py

diff --git a/tempest/cmd/verify_tempest_config.py b/tempest/cmd/verify_tempest_config.py
index 5d867df..bc06630 100644
--- a/tempest/cmd/verify_tempest_config.py
+++ b/tempest/cmd/verify_tempest_config.py
@@ -157,7 +157,7 @@
 
     if service not in extensions_client:
         print('No tempest extensions client for %s' % service)
-        exit(1)
+        sys.exit(1)
     return extensions_client[service]
 
 
@@ -170,7 +170,7 @@
     }
     if service not in extensions_options:
         print('No supported extensions list option for %s' % service)
-        exit(1)
+        sys.exit(1)
     return extensions_options[service]
 
 

tools/check_logs.py

diff --git a/tools/check_logs.py b/tools/check_logs.py
index 9b707b0..fa7129d 100755
--- a/tools/check_logs.py
+++ b/tools/check_logs.py
@@ -105,7 +105,7 @@
 def main(opts):
     if opts.directory and opts.url or not (opts.directory or opts.url):
         print("Must provide exactly one of -d or -u")
-        exit(1)
+        return 1
     print("Checking logs...")
     WHITELIST_FILE = os.path.join(
         os.path.abspath(os.path.dirname(os.path.dirname(__file__))),