[ARVADOS] updated: 1.3.0-1185-gb07145114

[Git user]

Summary of changes:
 services/fuse/arvados_fuse/__init__.py | 6 +++---
 services/fuse/tests/test_mount.py      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

       via  b071451144bb00134cb31c868aae640fee4eca24 (commit)
       via  5fb914334a7c9ab9af62cb754629d736f6f157d3 (commit)
       via  60e2d19a092f4b15d4d2484405c46cbd84914616 (commit)
       via  2c4bc5af8de7fe7a021088c040e4c6cea223bcd1 (commit)
      from  1465471dacdc30047c02376cd9800efd07d17974 (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 b071451144bb00134cb31c868aae640fee4eca24
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Jul 11 17:07:10 2019 -0400

    14965: Simplifies previous fix to FuseMagicTest
    
    Arvados-DCO-1.1-Signed-off-by:  <ebiagiotti at veritasgenetics.com>

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index bff8c53bb..1b9d361bf 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -169,11 +169,11 @@ class FuseMagicTest(MountTestBase):
             llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.non_project_group))
 
         files = {}
-        files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = b'data 1'
+        files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1'
 
         for k, v in viewitems(files):
             with open(os.path.join(self.mounttmp, k), 'rb') as f:
-                self.assertEqual(v, f.read())
+                self.assertEqual(v, f.read().decode())
 
 
 class FuseTagsTest(MountTestBase):

commit 5fb914334a7c9ab9af62cb754629d736f6f157d3
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Jul 11 17:06:00 2019 -0400

    14965: Fixes FuseMountTest encoding
    
    Arvados-DCO-1.1-Signed-off-by:  <ebiagiotti at veritasgenetics.com>

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 2652142fd..bff8c53bb 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -117,8 +117,8 @@ class FuseMountTest(MountTestBase):
                  'dir2/dir3/thing8.txt': 'data 8'}
 
         for k, v in viewitems(files):
-            with open(os.path.join(self.mounttmp, k)) as f:
-                self.assertEqual(v, f.read())
+            with open(os.path.join(self.mounttmp, k), 'rb') as f:
+                self.assertEqual(v, f.read().decode())
 
 
 class FuseMagicTest(MountTestBase):

commit 60e2d19a092f4b15d4d2484405c46cbd84914616
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Jul 11 17:04:40 2019 -0400

    14965: Fixes rmdir and rename op encoding
    
    Arvados-DCO-1.1-Signed-off-by:  <ebiagiotti at veritasgenetics.com>

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index dca3d2fd6..ef66a97fa 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -822,7 +822,7 @@ class Operations(llfuse.Operations):
     def rmdir(self, inode_parent, name, ctx=None):
         _logger.debug("arv-mount rmdir: parent_inode %i '%s'", inode_parent, name)
         p = self._check_writable(inode_parent)
-        p.rmdir(name)
+        p.rmdir(name.decode())
 
     @rename_time.time()
     @catch_exceptions
@@ -830,7 +830,7 @@ class Operations(llfuse.Operations):
         _logger.debug("arv-mount rename: old_parent_inode %i '%s' new_parent_inode %i '%s'", inode_parent_old, name_old, inode_parent_new, name_new)
         src = self._check_writable(inode_parent_old)
         dest = self._check_writable(inode_parent_new)
-        dest.rename(name_old, name_new, src)
+        dest.rename(name_old.decode(), name_new.decode(), src)
 
     @flush_time.time()
     @catch_exceptions

commit 2c4bc5af8de7fe7a021088c040e4c6cea223bcd1
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Jul 11 10:37:24 2019 -0400

    14965: Fixes mkdir name encoding
    
    Arvados-DCO-1.1-Signed-off-by:  <ebiagiotti at veritasgenetics.com>

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 41134e2ee..dca3d2fd6 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -59,7 +59,6 @@ standard_library.install_aliases()
 from builtins import next
 from builtins import str
 from builtins import object
-from builtins import bytes
 import os
 import sys
 import llfuse
@@ -799,6 +798,7 @@ class Operations(llfuse.Operations):
     @mkdir_time.time()
     @catch_exceptions
     def mkdir(self, inode_parent, name, mode, ctx=None):
+        name = name.decode()
         _logger.debug("arv-mount mkdir: parent_inode %i '%s' %o", inode_parent, name, mode)
 
         p = self._check_writable(inode_parent)

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


hooks/post-receive
--