[ARVADOS] updated: 8b93280fb2fae252e29263660e9591fcaa2d8722

[Git user]

Summary of changes:
 services/fuse/arvados_fuse/fusedir.py |  3 ++-
 services/fuse/tests/test_cache.py     | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

       via  8b93280fb2fae252e29263660e9591fcaa2d8722 (commit)
      from  55778ad90a9b869f514e729b3f85c12383f4e2a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8b93280fb2fae252e29263660e9591fcaa2d8722
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Apr 5 13:22:06 2016 -0400

    8712: Propagate return value of clear() from super method.  Test cache clearing
    collections with subdirs.

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index bfcf0ef..3f2bcd5 100644
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -321,8 +321,9 @@ class CollectionDirectoryBase(Directory):
         src.flush()
 
     def clear(self, force=False):
-        super(CollectionDirectoryBase, self).clear(force)
+        r = super(CollectionDirectoryBase, self).clear(force)
         self.collection = None
+        return r
 
 
 class CollectionDirectory(CollectionDirectoryBase):
diff --git a/services/fuse/tests/test_cache.py b/services/fuse/tests/test_cache.py
index 7dab2c5..7aa0009 100644
--- a/services/fuse/tests/test_cache.py
+++ b/services/fuse/tests/test_cache.py
@@ -21,6 +21,11 @@ class TmpCollectionTest(IntegrationTest):
             cw = arvados.collection.Collection()
             f = cw.open("blurg%i" % i, "w")
             f.write("bloop%i" % i)
+
+            cw.mkdirs("dir%i" % i)
+            f = cw.open("dir%i/blurg" % i, "w")
+            f.write("dirbloop%i" % i)
+
             cw.save_new()
             pdh.append(cw.portable_data_hash())
         self.pool_test(self.mnt, pdh)
@@ -30,6 +35,11 @@ class TmpCollectionTest(IntegrationTest):
         for i,v in enumerate(pdh):
             j = os.path.join(mnt, "by_id", v, "blurg%i" % i)
             self.assertTrue(os.path.exists(j))
+            j = os.path.join(mnt, "by_id", v, "dir%i/blurg" % i)
+            self.assertTrue(os.path.exists(j))
+
         for i,v in enumerate(pdh):
             j = os.path.join(mnt, "by_id", v, "blurg%i" % i)
             self.assertTrue(os.path.exists(j))
+            j = os.path.join(mnt, "by_id", v, "dir%i/blurg" % i)
+            self.assertTrue(os.path.exists(j))

-----------------------------------------------------------------------


hooks/post-receive
--