]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: Fix test to run with btrfs which has snap_### dirs 8420/head
authorDavid Zafman <dzafman@redhat.com>
Fri, 1 Apr 2016 21:33:14 +0000 (14:33 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 1 Apr 2016 21:35:50 +0000 (14:35 -0700)
Fixes: http://tracker.ceph.com/issues/15347
Signed-off-by: David Zafman <dzafman@redhat.com>
src/test/ceph_objectstore_tool.py

index 20a5d3088918d4925922415044eba2765d1eae8f..789aae4adc72079725ace195f2d252bea8d892e0 100755 (executable)
@@ -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)