test: Have test_fs work with non-functional guestmount tools
PATCH v2 1/1 test: Have test_fs work with non-functional guestmount tools
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.
[1]: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725
---
Changes in v2:
- Rework to not have another try/except nesting as Stephen suggested. Tested this out and we still skip the tests and now note that sudo doesn't work. Since the README for tests says sudo or guestmount, I think this is OK.
This, I suspect, will also fix the cases where in CI we attempt to run the FS tests but do not as guestmount fails. I'm not going to remove guestmount from the Docker containers as it's a useful reference for "what is required for a minimal environment for U-Boot builds" and perhaps we will switch to Debian instead at some point.
--- test/py/tests/test_fs/conftest.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
test/py/tests/test_fs/conftest.py +9 -11
@@ -206,21 +206,19 @@ def mount_fs(fs_type, device, mount_point): fuse_mounted = False try: if tool_is_in_path('guestmount'): - fuse_mounted = True check_call('guestmount -a %s -m /dev/sda %s' % (device, mount_point), shell=True) - else: - mount_opt = 'loop,rw' - if re.match('fat', fs_type): - mount_opt += ',umask=0000' + fuse_mounted = True + except CalledProcessError: + mount_opt = 'loop,rw' + if re.match('fat', fs_type): + mount_opt += ',umask=0000' - check_call('sudo mount -o %s %s %s' - % (mount_opt, device, mount_point), shell=True) + check_call('sudo mount -o %s %s %s' + % (mount_opt, device, mount_point), shell=True) - # may not be effective for some file systems - check_call('sudo chmod a+rw %s' % mount_point, shell=True) - except CalledProcessError: - raise + # may not be effective for some file systems + check_call('sudo chmod a+rw %s' % mount_point, shell=True) def umount_fs(mount_point): """Unmount a volume.
Signature · 1 line
2.17.1
PATCH v2 1/1 test: Have test_fs work with non-functional guestmount tools
Quoted 8 lines · Tom Rini
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.
[1]: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725
PATCH v2 1/1 test: Have test_fs work with non-functional guestmount tools
In reply to Tom RiniQuoted 21 lines · Tom Rini
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.
[1]: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725
Cc Heinrich Schuchardt <[email protected]>Cc Simon Glass <[email protected]>Cc Stephen Warren <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Changes in v2:
- Rework to not have another try/except nesting as Stephen suggested. Tested this out and we still skip the tests and now note that sudo doesn't work. Since the README for tests says sudo or guestmount, I think this is OK.
Quoted 8 lines
This, I suspect, will also fix the cases where in CI we attempt to run the FS tests but do not as guestmount fails. I'm not going to remove guestmount from the Docker containers as it's a useful reference for "what is required for a minimal environment for U-Boot builds" and perhaps we will switch to Debian instead at some point.
--- test/py/tests/test_fs/conftest.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
PATCH v2 1/1 test: Have test_fs work with non-functional guestmount tools
In reply to Tom RiniQuoted 7 lines · Tom Rini
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.
Quoted 8 lines
[1]: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725
Cc Heinrich Schuchardt <[email protected]>Cc Simon Glass <[email protected]>Cc Stephen Warren <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Stephen Warren <[email protected]>Reviewed-by Simon Glass <[email protected]>
So, I'm rejecting this patch. While it fixes the tests running under GitLab, when the runner is configured correctly:
https://gitlab.denx.de/u-boot/u-boot/-/jobs/124997
It causes Travis to fail the tests now:
https://travis-ci.org/github/trini/u-boot/jobs/708328027
whereas the usually are run and pass:
https://travis-ci.org/github/trini/u-boot/jobs/708035304
And in neither case are these all run on Azure:
https://dev.azure.com/u-boot/u-boot/_build/results?buildId=909&view=logs&j=50449d1b-398e-53ae-48fa-6bf338edeb51&t=97605dd2-f5a5-5dd7-2118-315ffdc8bcd6
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200715/a40dd75b/attachment.sig>