
On 7/7/20 9:53 AM, Tom Rini wrote:
Since 2011 Ubuntu has intentionally broken support for guestmount[1] by default and requires sysadmin intervention to re-enable support. This in turn exposed that in our tests if guestmount is available but fails we do not fall back to trying to use sudo. Restructure our code to try sudo if guestmount fails rather than only when it is not in our path. Further, only note that we are using fuse on success of the call.
That is ... an interesting bug!
This change looks conceptually fine.
diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py
...
@@ -206,10 +206,11 @@ def mount_fs(fs_type, device, mount_point):
...> + try:
mount_opt = 'loop,rw' if re.match('fat', fs_type): mount_opt += ',umask=0000'
...
# may not be effective for some file systems check_call('sudo chmod a+rw %s' % mount_point, shell=True)
except CalledProcessError:
raise
That last/inner try...except/raise clause doesn't seem useful. Perhaps just remote try...except and keep the body?