X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c1e7255a85dfc2807ba78e1cf9d109d896c80b42..381926c94a3b41d04101f68ec6a33e88fc795254:/services/fuse/tests/test_mount.py

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index a6440033e1..fa64a5c4a4 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -21,7 +21,12 @@ class MountTestBase(unittest.TestCase):
     def tearDown(self):
         # llfuse.close is buggy, so use fusermount instead.
         #llfuse.close(unmount=True)
-        subprocess.call(["fusermount", "-u", self.mounttmp])
+        count = 0
+        success = 1
+        while (count < 9 and success != 0):
+          success = subprocess.call(["fusermount", "-u", self.mounttmp])
+          time.sleep(0.5)
+          count += 1
 
         os.rmdir(self.mounttmp)
         shutil.rmtree(self.keeptmp)
@@ -309,8 +314,8 @@ class FuseGroupsTest(MountTestBase):
         d2 = os.listdir(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso'))
         d2.sort()
         self.assertEqual(['1f4b0bc7583c2a7f9102c395f4ffc5e3+45 added sometime',
-                          "I'm a job in a folder",
-                          "I'm a template in a folder",
+                          "I'm a job in a project",
+                          "I'm a template in a project",
                           "zzzzz-j58dm-5gid26432uujf79",
                           "zzzzz-j58dm-7r18rnd5nzhg5yk",
                           "zzzzz-j58dm-ypsjlol9dofwijz",
@@ -319,11 +324,12 @@ class FuseGroupsTest(MountTestBase):
 
         d3 = os.listdir(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso', 'zzzzz-j7d0g-axqo7eu9pwvna1x'))
         d3.sort()
-        self.assertEqual(["I'm in a subfolder, too",
+        self.assertEqual(["I'm in a subproject, too",
+                          "ea10d51bcf88862dbcc36eb292017dfd+45 added sometime",
                           "zzzzz-j58dm-c40lddwcqqr1ffs"
                       ], d3)
 
-        with open(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso', "I'm a template in a folder")) as f:
+        with open(os.path.join(self.mounttmp, 'zzzzz-j7d0g-v955i6s2oi1cbso', "I'm a template in a project")) as f:
             j = json.load(f)
             self.assertEqual("Two Part Pipeline Template", j['name'])