From: Pavani Rajula <rpavani1998@gmail.com>
Date: Thu, 16 Aug 2018 06:04:04 +0000 (+0530)
Subject: Allow to unittest shell using transcript
X-Git-Tag: v14.0.1~574^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b0358447aace8d5364519510f14af2d9c011feb4;p=ceph.git

Allow to unittest shell using transcript

Signed-off-by: Pavani Rajula <rpavani1998@gmail.com>
---

diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell
index 609bc7fb907d2..da2ac79577625 100644
--- a/src/tools/cephfs/cephfs-shell
+++ b/src/tools/cephfs/cephfs-shell
@@ -957,10 +957,12 @@ if __name__ == '__main__':
     if args.config:
         config_file = args.config
     if args.batch:
-        args.commands = ['load ' + args.batch, 'quit']
+        args.commands = ['load ' + args.batch, ',quit']
+    if args.test:
+        args.commands.extend(['-t,'] + [arg+',' for arg in args.test])
     sys.argv.clear()
     sys.argv.append(exe)
-    sys.argv.extend(' '.join(args.commands).split(','))
+    sys.argv.extend([i.strip() for i in ' '.join(args.commands).split(',')])
     setup_cephfs(config_file)
     c = CephFSShell()
     c.cmdloop()