From 52141835e85e4014a691e036f89bcd71a98bd6b2 Mon Sep 17 00:00:00 2001 From: Tim Pierce Date: Wed, 29 Oct 2014 16:23:08 -0400 Subject: [PATCH] 4040: clarify variable names Per code review: give d1, d2, d3 more descriptive variable names. --- services/fuse/tests/test_mount.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 55fd0f99a1..3db5281eb0 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, -- 2.30.2