summaryrefslogtreecommitdiff
path: root/tests/unittests/test_datasource/test_configdrive.py
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2014-02-07 10:10:02 +0200
committerBen Howard <ben.howard@canonical.com>2014-02-07 10:10:02 +0200
commit3087da32ec5cf84c51e0ebdd80a71a84b174a392 (patch)
tree1918a08395e97dbd84bbf43c65c5740bf4ee3365 /tests/unittests/test_datasource/test_configdrive.py
parent4fe439b9e137e0b59d00e919dc16aea9da35082a (diff)
parent3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff)
downloadvyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.tar.gz
vyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.zip
Rebase on upstream
Diffstat (limited to 'tests/unittests/test_datasource/test_configdrive.py')
-rw-r--r--tests/unittests/test_datasource/test_configdrive.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py
index d5935294..1f4a0a0b 100644
--- a/tests/unittests/test_datasource/test_configdrive.py
+++ b/tests/unittests/test_datasource/test_configdrive.py
@@ -285,10 +285,11 @@ class TestConfigDriveDataSource(MockerTestCase):
self.assertEqual(["/dev/vdb", "/dev/zdd"],
ds.find_candidate_devs())
- # verify that partitions are not considered
+ # verify that partitions are considered, that have correct label.
devs_with_answers = {"TYPE=vfat": ["/dev/sda1"],
"TYPE=iso9660": [], "LABEL=config-2": ["/dev/vdb3"]}
- self.assertEqual([], ds.find_candidate_devs())
+ self.assertEqual(["/dev/vdb3"],
+ ds.find_candidate_devs())
finally:
util.find_devs_with = orig_find_devs_with