diff options
author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-02-07 15:14:26 -0800 |
---|---|---|
committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-02-07 15:14:26 -0800 |
commit | 2983a26ecf9716dc957ec4bacf15544072774190 (patch) | |
tree | a7e074c21789ebc553713b3fd591fd9bbe4a9684 /tests/unittests/test_datasource/test_configdrive.py | |
parent | 810df2c55c108e7e4064263e508d9786d8b1dc8e (diff) | |
parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
download | vyos-cloud-init-2983a26ecf9716dc957ec4bacf15544072774190.tar.gz vyos-cloud-init-2983a26ecf9716dc957ec4bacf15544072774190.zip |
Remerged with trunk
Diffstat (limited to 'tests/unittests/test_datasource/test_configdrive.py')
-rw-r--r-- | tests/unittests/test_datasource/test_configdrive.py | 5 |
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 bd6cdd5d..937b88c1 100644 --- a/tests/unittests/test_datasource/test_configdrive.py +++ b/tests/unittests/test_datasource/test_configdrive.py @@ -288,10 +288,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 |