summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGonéri Le Bouder <goneri@lebouder.net>2021-12-13 12:31:39 -0500
committerGitHub <noreply@github.com>2021-12-13 11:31:39 -0600
commitf4692c5d96323dc635fca26b742199d4c41f88d3 (patch)
tree374e3ee1032738f11413a57af79644fbd3eb8d40 /tests
parente9634266ea52bf184727fb0782d5dc35f9ed1468 (diff)
downloadvyos-cloud-init-f4692c5d96323dc635fca26b742199d4c41f88d3.tar.gz
vyos-cloud-init-f4692c5d96323dc635fca26b742199d4c41f88d3.zip
find_devs_with_openbsd: ensure we return the last entry (#1149)
`sysctl -n hw.disknames` returns a trailing `\n`. We need to clean this up. In addition, the criteria matching system is a source of problem because: - we don't have a way to look up the label of the partition - we've got situation where an ISO image can be exposed through a virtio block device. So we just totally ignore the value of `criteria`. We end-up with a slightly longer loop of mount-retry. But this way we're sure we don't miss a configuration disk. Tested on Kubvirt with the help of Brady Pratt @jbpratt.
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index c551835f..61b9e303 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -2336,7 +2336,7 @@ class TestFindDevs:
def test_find_devs_with_openbsd_with_criteria(self, m_subp):
m_subp.return_value = ('cd0:,sd0:630d98d32b5d3759,sd1:,fd0:', '')
devlist = util.find_devs_with_openbsd(criteria="TYPE=iso9660")
- assert devlist == ['/dev/cd0a']
+ assert devlist == ['/dev/cd0a', '/dev/sd1a', '/dev/sd1i']
# lp: #1841466
devlist = util.find_devs_with_openbsd(criteria="LABEL_FATBOOT=A_LABEL")