From 4d0c668e9eb50c2149cfe36caee37c531541d1be Mon Sep 17 00:00:00 2001 From: David Zafman Date: Fri, 29 Apr 2016 15:33:44 -0700 Subject: [PATCH] scrub_test: Fixes need with wip-13507 Accept an attribute if not present as False Change required due change to dict with "epoch" and "inconsistents" Signed-off-by: David Zafman --- tasks/scrub_test.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tasks/scrub_test.py b/tasks/scrub_test.py index a2ab2c46c69d8..23ab8b954b1c5 100644 --- a/tasks/scrub_test.py +++ b/tasks/scrub_test.py @@ -236,9 +236,8 @@ class InconsistentObjChecker: log.info('shard = %r' % shard) log.info('attr = %s' % attr_name) assert 'osd' in shard - assert attr_name in shard osd = shard['osd'] - attr = shard[attr_name] + attr = shard.get(attr_name, False) if osd == self.osd: assert bad_attr is None, \ "multiple entries found for the given OSD" @@ -302,10 +301,10 @@ def test_list_inconsistent_obj(ctx, manager, osd_remote, pg, acting, osd_id, with contextlib.closing(StringIO()) as out: mon.run(args=cmd.split(), stdout=out) objs = json.loads(out.getvalue()) - assert len(objs) == 1 + assert len(objs['inconsistents']) == 1 checker = InconsistentObjChecker(osd_id, acting, obj_name) - inc_obj = objs[0] + inc_obj = objs['inconsistents'][0] log.info('inc = %r', inc_obj) checker.basic_checks(inc_obj) for check in checks: -- 2.39.5