[ARVADOS] updated: 52141835e85e4014a691e036f89bcd71a98bd6b2

[git at public.curoverse.com]

Summary of changes:
 services/fuse/tests/test_mount.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

       via  52141835e85e4014a691e036f89bcd71a98bd6b2 (commit)
      from  ddc1f6b0c54b72df395cfef26e0dc4eb8f65463d (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 52141835e85e4014a691e036f89bcd71a98bd6b2
Author: Tim Pierce <twp at curoverse.com>
Date:   Wed Oct 29 16:23:08 2014 -0400

    4040: clarify variable names
    
    Per code review: give d1, d2, d3 more descriptive variable names.

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 55fd0f9..3db5281 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -250,22 +250,28 @@ class FuseSharedTest(MountTestBase):
         # wait until the driver is finished initializing
         operations.initlock.wait()
 
-        d1 = os.listdir(self.mounttmp)
-        d1.sort()
-        self.assertIn('FUSE User', d1)
-
-        d2 = os.listdir(os.path.join(self.mounttmp, 'FUSE User'))
-        d2.sort()
+        # shared_dirs is a list of the directories exposed
+        # by fuse.SharedDirectory (i.e. any object visible
+        # to the current user)
+        shared_dirs = os.listdir(self.mounttmp)
+        shared_dirs.sort()
+        self.assertIn('FUSE User', shared_dirs)
+
+        # fuse_user_dirs is a list of the directories owned
+        # by the "FUSE User" test user.
+        fuse_user_dirs = os.listdir(os.path.join(self.mounttmp, 'FUSE User'))
+        fuse_user_dirs.sort()
         self.assertEqual(['FUSE Test Project',
                           'collection #1 owned by FUSE',
                           'collection #2 owned by FUSE'
-                      ], d2)
+                      ], fuse_user_dirs)
 
-        d3 = os.listdir(os.path.join(self.mounttmp, 'FUSE User', 'FUSE Test Project'))
-        d3.sort()
+        # test_proj_files is a list of the files in the FUSE Test Project.
+        test_proj_files = os.listdir(os.path.join(self.mounttmp, 'FUSE User', 'FUSE Test Project'))
+        test_proj_files.sort()
         self.assertEqual(['Pipeline Template in FUSE Project.pipelineTemplate',
                           'collection in FUSE project',
-                      ], d3)
+                      ], test_proj_files)
 
         with open(os.path.join(
                 self.mounttmp,

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


hooks/post-receive
--