projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16773-webshell-js' into 16796-arvbox-webshell
[arvados.git]
/
services
/
fuse
/
tests
/
test_unmount.py
diff --git
a/services/fuse/tests/test_unmount.py
b/services/fuse/tests/test_unmount.py
index bf180beb7aaeea9cc02e4a33bc7a9645784a7e99..e89571087e5eaf885ce47e41e10603fb805d11de 100644
(file)
--- a/
services/fuse/tests/test_unmount.py
+++ b/
services/fuse/tests/test_unmount.py
@@
-2,6
+2,8
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
+from __future__ import absolute_import
+from builtins import bytes
import arvados_fuse.unmount
import os
import subprocess
import arvados_fuse.unmount
import os
import subprocess
@@
-10,7
+12,7
@@
import tempfile
import time
import unittest
import time
import unittest
-from integration_test import IntegrationTest
+from
.
integration_test import IntegrationTest
class UnmountTest(IntegrationTest):
def setUp(self):
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.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
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
def _wait_for_mounts(self, mounts):
deadline = time.time() + 10