From c0907f99e87898f7e0afd47f4ed143b20a477cb7 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sun, 10 Jan 2021 13:00:25 -0800 Subject: [PATCH] qa: allow kwargs for raw_cluster_cmd And refactor. Signed-off-by: Patrick Donnelly --- qa/tasks/ceph_manager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py index f462e0430b9b5..1fc11971f0f31 100644 --- a/qa/tasks/ceph_manager.py +++ b/qa/tasks/ceph_manager.py @@ -1346,12 +1346,13 @@ class CephManager: kwargs['args'] = prefix + list(kwargs['args']) return self.controller.run(**kwargs) - def raw_cluster_cmd(self, *args): + def raw_cluster_cmd(self, *args, **kwargs): """ Start ceph on a raw cluster. Return count """ - return self.run_cluster_cmd(**{'args': args, - 'stdout': StringIO()}).stdout.getvalue() + stdout = kwargs.pop('stdout', StringIO()) + p = self.run_cluster_cmd(args=args, stdout=stdout, **kwargs) + return p.stdout.getvalue() def raw_cluster_cmd_result(self, *args, **kwargs): """ -- 2.39.5