From 5b23fb221861f12e4dc06f270129705ec1edc985 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 10 Jun 2021 12:06:43 -0700 Subject: [PATCH] qa: fetch stdout from rados calls This test no longer exist in master so the changes were misapplied during backport. Fixes: https://tracker.ceph.com/issues/51170 Signed-off-by: Patrick Donnelly --- qa/tasks/cephfs/test_volume_client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/test_volume_client.py b/qa/tasks/cephfs/test_volume_client.py index 5cd6644b0371..d1b2e760c4e4 100644 --- a/qa/tasks/cephfs/test_volume_client.py +++ b/qa/tasks/cephfs/test_volume_client.py @@ -252,7 +252,7 @@ vc.disconnect() ns_in_attr = self.mount_a.getfattr(os.path.join("myprefix", group_id, volume_id), "ceph.dir.layout.pool_namespace") self.assertEqual(namespace, ns_in_attr) - objects_in_ns = set(self.fs.rados(["ls"], pool=pool_name, namespace=namespace).split("\n")) + objects_in_ns = set(self.fs.rados(["ls"], pool=pool_name, namespace=namespace, stdout=StringIO()).stdout.getvalue().split("\n")) self.assertNotEqual(objects_in_ns, set()) # De-authorize the guest @@ -1542,7 +1542,7 @@ vc.disconnect() obj_data = obj_data ))) - read_data = self.fs.rados(['get', obj_name, '-'], pool=pool_name) + read_data = self.fs.rados(['get', obj_name, '-'], pool=pool_name, stdout=StringIO()).stdout.getvalue() self.assertEqual(obj_data, read_data) def test_get_object(self): -- 2.47.3