]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: use sys.argv instead of implicit
authorLoic Dachary <ldachary@redhat.com>
Thu, 27 Aug 2015 10:37:15 +0000 (12:37 +0200)
committerLoic Dachary <ldachary@redhat.com>
Sat, 29 Aug 2015 00:37:52 +0000 (02:37 +0200)
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>
src/ceph-disk

index 9dbcd53a87db84de1aa487b5cebaf8de540998e1..84a75373b1a6be84963c686a0f757f82e962f649 100755 (executable)
@@ -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 = {}