From aedc529b4cd7292d727921e8194a980b725c35d7 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Fri, 1 Apr 2016 14:33:14 -0700 Subject: [PATCH] test: Fix test to run with btrfs which has snap_### dirs Fixes: http://tracker.ceph.com/issues/15347 Signed-off-by: David Zafman --- src/test/ceph_objectstore_tool.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 20a5d3088918d..789aae4adc720 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -400,6 +400,9 @@ def check_data(DATADIR, TMPFILE, OSDDIR, SPLIT_NAME): logging.error("Can't find imported object {name}".format(name=file)) ERRORS += 1 for obj_loc in obj_locs: + # For btrfs skip snap_* dirs + if re.search("/snap_[0-9]*/", obj_loc) is not None: + continue repcount += 1 cmd = "diff -q {src} {obj_loc}".format(src=path, obj_loc=obj_loc) logging.debug(cmd) -- 2.39.5