From 38d0e7bd5502030d65ea433e975ab1af77f86c6f Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 27 Aug 2015 12:37:15 +0200 Subject: [PATCH] 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 --- src/ceph-disk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 = {} -- 2.47.3