Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: lsblk --json output changes mountpoint key to mountpoinst [] #1261

Merged
merged 1 commit into from
Feb 10, 2022

Conversation

blackboxsw
Copy link
Collaborator

@blackboxsw blackboxsw commented Feb 10, 2022

Proposed Commit Message

Ubuntu Jammy output from lsblk --json now contains
'mountpoints': [...] instead of 'mountpoint' for children devs.

Let our integration test handle either case.

Test Steps

 CLOUD_INIT_PLATFORM=lxd_vm CLOUD_INIT_KEEP_INSTANCE=true CLOUD_INIT_CLOUD_INIT_SOURCE=IN_PLACE CLOUD_INIT_OS_IMAGE=bionic::ubuntu::bionic  .tox/integration-tests/bin/pytest tests/integration_tests/modules/test_disk_setup.py::TestDeviceAliases

-- or Jammy --
 CLOUD_INIT_PLATFORM=lxd_vm CLOUD_INIT_KEEP_INSTANCE=true CLOUD_INIT_CLOUD_INIT_SOURCE=IN_PLACE CLOUD_INIT_OS_IMAGE=jammy::ubuntu::jammy .tox/integration-tests/bin/pytest tests/integration_tests/modules/test_disk_setup.py::TestDeviceAliases

Checklist:

  • My code follows the process laid out in the documentation
  • I have updated or added any unit tests accordingly
  • I have updated or added any documentation accordingly

Ubuntu Jammy output from lsblk --json now contains
'mountpoints': [...] instead of 'mountpoint' for children devs.

Let our integration test handle either case.
@blackboxsw blackboxsw merged commit deb3ae8 into canonical:main Feb 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants