From: David Zafman <dzafman@redhat.com>
Date: Fri, 1 Apr 2016 21:33:14 +0000 (-0700)
Subject: test: Fix test to run with btrfs which has snap_### dirs
X-Git-Tag: v10.1.1~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8420%2Fhead;p=ceph.git

test: Fix test to run with btrfs which has snap_### dirs

Fixes: http://tracker.ceph.com/issues/15347

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
index 20a5d3088918..789aae4adc72 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)