14965: Fixes replace test encoding

[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 d25ab714d66e7227171d412454d02bc3bff9f3f5..2652142fd9507de30841bc4f0fe5f29c81d364a2 100644 (file)
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -2,6 +2,10 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+from __future__ import absolute_import
+from future.utils import viewitems
+from builtins import str
+from builtins import object
 import json
 import llfuse
 import logging
@@ -13,9 +17,9 @@ import unittest
 
 import arvados
 import arvados_fuse as fuse
-import run_test_server
+from . import run_test_server
 
-from mount_test_base import MountTestBase
+from .mount_test_base import MountTestBase
 
 logger = logging.getLogger('arvados.arv-mount')
 
@@ -31,7 +35,7 @@ class AssertWithTimeout(object):
         self.done = False
         return self
 
-    def next(self):
+    def __next__(self):
         if self.done:
             raise StopIteration
         return self.attempt
@@ -112,7 +116,7 @@ class FuseMountTest(MountTestBase):
                  'dir2/dir3/thing7.txt': 'data 7',
                  'dir2/dir3/thing8.txt': 'data 8'}
 
-        for k, v in files.items():
+        for k, v in viewitems(files):
             with open(os.path.join(self.mounttmp, k)) as f:
                 self.assertEqual(v, f.read())
 
@@ -165,10 +169,10 @@ 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')] = 'data 1'
+        files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = b'data 1'
 
-        for k, v in files.items():
-            with open(os.path.join(self.mounttmp, k)) as f:
+        for k, v in viewitems(files):
+            with open(os.path.join(self.mounttmp, k), 'rb') as f:
                 self.assertEqual(v, f.read())
 
 
@@ -235,7 +239,7 @@ def fuseSharedTestHelper(mounttmp):
             # check mtime on collection
             st = os.stat(baz_path)
             try:
-                mtime = st.st_mtime_ns / 1000000000
+                mtime = st.st_mtime_ns // 1000000000
             except AttributeError:
                 mtime = st.st_mtime
             self.assertEqual(mtime, 1391448174)
@@ -289,7 +293,7 @@ class FuseHomeTest(MountTestBase):
             'anonymously_accessible_project']
         found_in = 0
         found_not_in = 0
-        for name, item in run_test_server.fixture('collections').iteritems():
+        for name, item in viewitems(run_test_server.fixture('collections')):
             if 'name' not in item:
                 pass
             elif item['owner_uuid'] == public_project['uuid']:
@@ -1162,10 +1166,10 @@ class FuseMagicTestPDHOnly(MountTestBase):
                       llfuse.listdir(os.path.join(self.mounttmp, 'by_id')))
 
         files = {}
-        files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1'
+        files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = b'data 1'
 
-        for k, v in files.items():
-            with open(os.path.join(self.mounttmp, k)) as f:
+        for k, v in viewitems(files):
+            with open(os.path.join(self.mounttmp, k), 'rb') as f:
                 self.assertEqual(v, f.read())
 
         # look up using uuid should fail when pdh_only is set