[ARVADOS] updated: 1.3.0-63-g41e5e2b86

Git user git at public.curoverse.com
Mon Dec 17 19:54:28 EST 2018


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

       via  41e5e2b86739f759a849dfcac38d442b106f2c46 (commit)
      from  56959ea8492ec4f08aa90c89a8f41e5c278e3c41 (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 41e5e2b86739f759a849dfcac38d442b106f2c46
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Dec 17 21:54:07 2018 -0300

    14539: Fixes fuse tests.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index fb282d1aa..6a00cdb6b 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -158,7 +158,7 @@ class FuseMagicTest(MountTestBase):
         self.assertIn(self.testcollection,
                       llfuse.listdir(os.path.join(self.mounttmp, 'by_id')))
         self.assertIn(self.test_project, mount_ls)
-        self.assertIn(self.test_project, 
+        self.assertIn(self.test_project,
                       llfuse.listdir(os.path.join(self.mounttmp, 'by_id')))
 
         with self.assertRaises(OSError):
@@ -617,7 +617,8 @@ class FuseRmTest(MountTestBase):
 
         # Can't have empty directories :-( so manifest will be empty.
         collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
-        self.assertEqual(collection2["manifest_text"], "")
+        self.assertRegexpMatches(collection2["manifest_text"],
+                                 r'./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n')
 
         self.pool.apply(fuseRmTestHelperRmdir, (self.mounttmp,))
 
@@ -674,7 +675,7 @@ class FuseMvFileTest(MountTestBase):
 
         collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute()
         self.assertRegexpMatches(collection2["manifest_text"],
-            r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$')
+            r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt\n\./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n')
 
 
 def fuseRenameTestHelper(mounttmp):

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list