[ARVADOS] updated: 0ea383a2924b37b47f2bc82fbe405fce4a03bd1f

git at public.curoverse.com git at public.curoverse.com
Thu Feb 5 18:30:25 EST 2015


Summary of changes:
 services/fuse/tests/test_mount.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  0ea383a2924b37b47f2bc82fbe405fce4a03bd1f (commit)
       via  21a824c12633d3775b449ec9b06148546078f1a8 (commit)
      from  c722a8bba1bd155f3e36ef4402f684e36ea3e5ec (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 0ea383a2924b37b47f2bc82fbe405fce4a03bd1f
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Feb 5 18:31:12 2015 -0500

    3021: Reduce race potential by resetting database after fuse unmounts.

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index fda9011..1c06d42 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -31,8 +31,6 @@ class MountTestBase(unittest.TestCase):
         operations.initlock.wait()
 
     def tearDown(self):
-        run_test_server.reset()
-
         # llfuse.close is buggy, so use fusermount instead.
         #llfuse.close(unmount=True)
         count = 0
@@ -44,6 +42,7 @@ class MountTestBase(unittest.TestCase):
 
         os.rmdir(self.mounttmp)
         shutil.rmtree(self.keeptmp)
+        run_test_server.reset()
 
     def assertDirContents(self, subdir, expect_content):
         path = self.mounttmp

commit 21a824c12633d3775b449ec9b06148546078f1a8
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Feb 5 18:12:22 2015 -0500

    3021: Remove unused variable.

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 9fe8acd..fda9011 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -19,7 +19,7 @@ class MountTestBase(unittest.TestCase):
         self.mounttmp = tempfile.mkdtemp()
         run_test_server.run()
         run_test_server.authorize_with("admin")
-        self.api = api = fuse.SafeApi(arvados.config)
+        self.api = fuse.SafeApi(arvados.config)
 
     def make_mount(self, root_class, **root_kwargs):
         operations = fuse.Operations(os.getuid(), os.getgid())

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list