From ce8dd02cbf2524dcc4df1e7a6716396afe8128f3 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Wed, 31 Dec 2014 13:40:33 +0100 Subject: [PATCH] Fix dict merge conflict in test_unpartitioned_extlinux_unstable --- tests/integration/virtualbox_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py index 26fa4c3..36c8b67 100644 --- a/tests/integration/virtualbox_tests.py +++ b/tests/integration/virtualbox_tests.py @@ -58,7 +58,7 @@ def test_partitioned_grub(): def test_unpartitioned_extlinux_unstable(): 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']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: