14865: Fixes test mount type test

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index fa0d8ca7fbb8fe809a93ff8153070e8d0ea969ce..43c57694821db30b06f6a333318fb337c7dfbd44 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -91,6 +91,7 @@ services/arv-git-httpd
 services/crunchstat
 services/dockercleaner
 services/fuse
+services/fuse:py3
 services/health
 services/keep-web
 services/keepproxy
@@ -991,6 +992,7 @@ pythonstuff=(
     sdk/cwl:py3
     services/dockercleaner:py3
     services/fuse
+    services/fuse:py3
     services/nodemanager
     tools/crunchstat-summary
     tools/crunchstat-summary:py3

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index f944a9197c8449af7431119816da575e20ab480b..76bba952ad6213ca24d1173c942601d6edbfe814 100644 (file)
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -53,12 +53,12 @@ from __future__ import absolute_import
 from __future__ import division
 from future.utils import viewitems
 from future.utils import native
+from future.utils import listvalues
 from future import standard_library
 standard_library.install_aliases()
 from builtins import next
 from builtins import str
 from builtins import object
-from builtins import dict
 import os
 import sys
 import llfuse
@@ -213,7 +213,7 @@ class InodeCache(object):
 
     def cap_cache(self):
         if self._total > self.cap:
-            for ent in self._entries.values():
+            for ent in listvalues(self._entries):
                 if self._total < self.cap or len(self._entries) < self.min_entries:
                     break
                 self._remove(ent, True)

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 28f0c54175922105b597ac75ab45dbfd8f9149df..765cd9425366682f8de3f6f3e0ed3e13c855a84a 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -39,7 +39,7 @@ setup(name='arvados_fuse',
       ],
       install_requires=[
         'arvados-python-client >= 0.1.20151118035730',
-        'llfuse >= 1.3.6',
+        'llfuse >=1.2, <=1.3.6',
         'python-daemon',
         'ciso8601 >= 2.0.0',
         'setuptools',

diff --git a/services/fuse/tests/test_mount_type.py b/services/fuse/tests/test_mount_type.py
index 79f2f321080cefac4b87a28f7511e4e7a91baf3f..833fdb38234cb5e9566c2ab72c39b8b4fd7ef72a 100644 (file)
--- a/services/fuse/tests/test_mount_type.py
+++ b/services/fuse/tests/test_mount_type.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+from future.utils import tobytes
 import logging
 import subprocess
 
@@ -21,7 +22,7 @@ class MountTypeTest(IntegrationTest):
             toks[4]
             for toks in [
                 line.split(' ')
-                for line in subprocess.check_output("mount").split("\n")
+                for line in subprocess.check_output(tobytes("mount")).split("\n")
             ]
             if len(toks) > 4 and toks[2] == mnt
         ])