From 55778ad90a9b869f514e729b3f85c12383f4e2a7 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 4 Apr 2016 15:40:33 -0400 Subject: [PATCH] 8712: Set self.collection = None when clearing the contents of a CollectionDirectory, so that it gets properly reloaded on update(). --- services/fuse/arvados_fuse/fusedir.py | 4 ++++ services/fuse/tests/test_cache.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py index 196bb221e9..bfcf0ef5ba 100644 --- a/services/fuse/arvados_fuse/fusedir.py +++ b/services/fuse/arvados_fuse/fusedir.py @@ -320,6 +320,10 @@ class CollectionDirectoryBase(Directory): self.flush() src.flush() + def clear(self, force=False): + super(CollectionDirectoryBase, self).clear(force) + self.collection = None + class CollectionDirectory(CollectionDirectoryBase): """Represents the root of a directory tree representing a collection.""" diff --git a/services/fuse/tests/test_cache.py b/services/fuse/tests/test_cache.py index fdbaaba42c..7dab2c5821 100644 --- a/services/fuse/tests/test_cache.py +++ b/services/fuse/tests/test_cache.py @@ -23,7 +23,6 @@ class TmpCollectionTest(IntegrationTest): f.write("bloop%i" % i) cw.save_new() pdh.append(cw.portable_data_hash()) - print cw.portable_data_hash(), cw.manifest_text() self.pool_test(self.mnt, pdh) @staticmethod -- 2.30.2