kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dict merge conflict in test_unpartitioned_extlinux_unstable

Browse source
This commit is contained in:
Anders Ingemann 2014-12-31 13:40:33 +01:00
parent a241842ef9
commit ce8dd02cbf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/virtualbox_tests.py
View file

@ -58,7 +58,7 @@ def test_partitioned_grub():
def test_unpartitioned_extlinux_unstable(): def test_unpartitioned_extlinux_unstable():
raise Skip('Jessie not yet working with extlinux') raise Skip('Jessie not yet working with extlinux')
std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'unpartitioned', 'root_password'] std_partials = ['base', 'unstable64', 'extlinux', 'unpartitioned', 'root_password']
custom_partials = [partials['vbox'], partials['vmdk']] custom_partials = [partials['vbox'], partials['vmdk']]
manifest_data = merge_manifest_data(std_partials, custom_partials) manifest_data = merge_manifest_data(std_partials, custom_partials)
with BootableManifest(manifest_data) as instance: with BootableManifest(manifest_data) as instance: