X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b629d9e88ad0c6e62018a8fb4768013975eccc70..ff31ac17e296f6a35e1d96f31af8061f7102c797:/services/fuse/tests/test_unmount.py diff --git a/services/fuse/tests/test_unmount.py b/services/fuse/tests/test_unmount.py index 8c60f9a0f5..3949fd5de4 100644 --- a/services/fuse/tests/test_unmount.py +++ b/services/fuse/tests/test_unmount.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: AGPL-3.0 -from __future__ import absolute_import import arvados_fuse.unmount import os import subprocess @@ -30,20 +29,21 @@ class UnmountTest(IntegrationTest): self.mnt]) subprocess.check_call( ['./bin/arv-mount', '--subtype', 'test', '--replace', - '--unmount-timeout', '10', + '--unmount-timeout', '60', self.mnt]) subprocess.check_call( ['./bin/arv-mount', '--subtype', 'test', '--replace', - '--unmount-timeout', '10', + '--unmount-timeout', '60', 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