diff options
author | Scott Moser <smoser@brickies.net> | 2016-11-18 16:50:06 -0500 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-11-18 16:50:06 -0500 |
commit | 053e93bc843199becf7b87aef334baa0da28878f (patch) | |
tree | ad4526c556b8923de5a7b6e2fc1e000a4ba20672 /tests/unittests/test_datasource/test_azure.py | |
parent | dd133325bffc8942c02bf4e7c77f54396cbd3a49 (diff) | |
parent | 9e904bbc3336b96475bfd00fb3bf1262ae4de49f (diff) | |
download | vyos-cloud-init-053e93bc843199becf7b87aef334baa0da28878f.tar.gz vyos-cloud-init-053e93bc843199becf7b87aef334baa0da28878f.zip |
merge from master at 0.7.8-49-g9e904bb
Diffstat (limited to 'tests/unittests/test_datasource/test_azure.py')
-rw-r--r-- | tests/unittests/test_datasource/test_azure.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index e90e903c..07127008 100644 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -349,7 +349,7 @@ class TestAzureDataSource(TestCase): cfg = dsrc.get_config_obj() self.assertEqual(dsrc.device_name_to_device("ephemeral0"), - "/dev/sdb") + DataSourceAzure.RESOURCE_DISK_PATH) assert 'disk_setup' in cfg assert 'fs_setup' in cfg self.assertIsInstance(cfg['disk_setup'], dict) @@ -462,14 +462,6 @@ class TestAzureBounce(TestCase): mock.patch.object(DataSourceAzure, 'list_possible_azure_ds_devs', mock.MagicMock(return_value=[]))) self.patches.enter_context( - mock.patch.object(DataSourceAzure, - 'find_fabric_formatted_ephemeral_disk', - mock.MagicMock(return_value=None))) - self.patches.enter_context( - mock.patch.object(DataSourceAzure, - 'find_fabric_formatted_ephemeral_part', - mock.MagicMock(return_value=None))) - self.patches.enter_context( mock.patch.object(DataSourceAzure, 'get_metadata_from_fabric', mock.MagicMock(return_value={}))) self.patches.enter_context( |