X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fc128bc6497aa266f925e2aa4821bde6fce9aade..a0398ebd1c50b1be2433c109af6bb0d263c54ea5:/services/fuse/tests/test_unmount.py diff --git a/services/fuse/tests/test_unmount.py b/services/fuse/tests/test_unmount.py index bf180beb7a..e89571087e 100644 --- a/services/fuse/tests/test_unmount.py +++ b/services/fuse/tests/test_unmount.py @@ -2,6 +2,8 @@ # # SPDX-License-Identifier: AGPL-3.0 +from __future__ import absolute_import +from builtins import bytes import arvados_fuse.unmount import os import subprocess @@ -10,7 +12,7 @@ import tempfile import time import unittest -from integration_test import IntegrationTest +from .integration_test import IntegrationTest class UnmountTest(IntegrationTest): def setUp(self): @@ -37,12 +39,13 @@ class UnmountTest(IntegrationTest): self.mnt, '--exec', 'true']) for m in subprocess.check_output(['mount']).splitlines(): - self.assertNotIn(' '+self.mnt+' ', m) + expected = bytes(' ' + self.mnt + ' ', encoding='utf-8') + self.assertNotIn(expected, m) def _mounted(self, mounts): all_mounts = subprocess.check_output(['mount']) return [m for m in mounts - if ' '+m+' ' in all_mounts] + if bytes(' ' + m + ' ', encoding='utf-8') in all_mounts] def _wait_for_mounts(self, mounts): deadline = time.time() + 10