Diff comments:
> diff --git a/tests/unittests/test_ds_identify.py > b/tests/unittests/test_ds_identify.py > index ad6c5cf..31cc622 100644 > --- a/tests/unittests/test_ds_identify.py > +++ b/tests/unittests/test_ds_identify.py > @@ -346,10 +346,12 @@ class TestDsIdentify(CiTestCase): > ovf_cdrom_by_label, rc=RC_NOT_FOUND, policy_dmi="disabled") > > # Add recognized labels > - for valid_fs_label in ['ovf-transport', 'OVF-TRANSPORT']: > + valid_ovf_labels = ['ovf-transport', 'OVF-TRANSPORT', > + "OVFENV", "ovfenv"] well, the python code doesnt currently require any label. And the ds-identify code *will* work without a known label, but it ends up doing a grep $DEVICE http://schemas.dmtf.org/ovf/environment/1 so this allows us to avoid that and also not 'mount' the device as the datasource does. > + for valid_ovf_label in valid_ovf_labels: > ovf_cdrom_by_label['mocks'][0]['out'] = blkid_out([ > {'DEVNAME': 'sr0', 'TYPE': 'iso9660', > - 'LABEL': valid_fs_label}]) > + 'LABEL': valid_ovf_label}]) > self._check_via_dict( > ovf_cdrom_by_label, rc=RC_FOUND, dslist=['OVF', DS_NONE]) > -- https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/336630 Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/1698669-ds-identify-fujitsu-ovf into cloud-init:master. _______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
