4040: clarify variable names

[arvados.git] / services / fuse / tests / test_mount.py

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 4af3467cd35450f2a3dcb3931fccee7ba14f9c5a..3db5281eb0c866e55e1411e4d5fe06d6912ec7d4 100644 (file)
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -250,34 +250,36 @@ class FuseSharedTest(MountTestBase):
         # wait until the driver is finished initializing
         operations.initlock.wait()
 
-        d1 = os.listdir(self.mounttmp)
-        d1.sort()
-        self.assertIn('Active User', d1)
-
-        d2 = os.listdir(os.path.join(self.mounttmp, 'Active User'))
-        d2.sort()
-        self.assertEqual(['A Project',
-                          "Empty collection",
-                          "Empty collection.link",
-                          "Pipeline Template with Input Parameter with Search.pipelineTemplate",
-                          "Pipeline Template with Jobspec Components.pipelineTemplate",
-                          "collection_expires_in_future",
-                          "collection_with_same_name_in_aproject_and_home_project",
-                          "pipeline_with_job.pipelineInstance"
-                      ], d2)
-
-        d3 = os.listdir(os.path.join(self.mounttmp, 'Active User', 'A Project'))
-        d3.sort()
-        self.assertEqual(["A Subproject",
-                          "Two Part Pipeline Template.pipelineTemplate",
-                          "collection_to_move_around",
-                          "collection_with_same_name_in_aproject_and_home_project",
-                          "zzzzz-4zz18-fy296fx3hot09f7 added sometime"
-                      ], d3)
-
-        with open(os.path.join(self.mounttmp, 'Active User', "A Project", "Two Part Pipeline Template.pipelineTemplate")) as f:
+        # 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'
+                      ], fuse_user_dirs)
+
+        # 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',
+                      ], test_proj_files)
+
+        with open(os.path.join(
+                self.mounttmp,
+                'FUSE User',
+                'FUSE Test Project',
+                'Pipeline Template in FUSE Project.pipelineTemplate')) as f:
             j = json.load(f)
-            self.assertEqual("Two Part Pipeline Template", j['name'])
+            self.assertEqual("Pipeline Template in FUSE Project", j['name'])
 
 
 class FuseHomeTest(MountTestBase):