From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 27 Aug 2015 10:37:15 +0000 (+0200)
Subject: ceph-disk: use sys.argv instead of implicit
X-Git-Tag: v9.1.0~252^2~1^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38d0e7bd5502030d65ea433e975ab1af77f86c6f;p=ceph.git

ceph-disk: use sys.argv instead of implicit

Make parse_args and main use and argument instead of relying on
argparse.ArgumentParser implicit use of sys.argv. It helps with tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 9dbcd53a87db..84a75373b1a6 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -2905,7 +2905,7 @@ def setup_sysconfdir(dir):
     SYSCONFDIR = dir
 
 
-def parse_args():
+def parse_args(argv):
     parser = argparse.ArgumentParser(
         'ceph-disk',
         )
@@ -3164,12 +3164,11 @@ def parse_args():
         func=main_zap,
         )
 
-    args = parser.parse_args()
+    args = parser.parse_args(argv)
     return args
 
-
-def main():
-    args = parse_args()
+def main(argv):
+    args = parse_args(argv)
 
     loglevel = logging.WARNING
     if args.verbose:
@@ -3221,5 +3220,5 @@ def main_catch(func, args):
 
 
 if __name__ == '__main__':
-    main()
+    main(sys.argv[1:])
     warned_about = {}