From 7a1187c6399f7ae099e35ad0a363194135e14663 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Mon, 20 Apr 2015 16:25:35 +0200 Subject: [PATCH] Simplify virtualbox test manifest composition --- tests/integration/virtualbox_tests.py | 31 +++++++++++++-------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py index 27e95ea..3453444 100644 --- a/tests/integration/virtualbox_tests.py +++ b/tests/integration/virtualbox_tests.py @@ -2,15 +2,14 @@ from manifests import merge_manifest_data from tools import boot_manifest from unittest.case import SkipTest -partials = {'vbox': 'provider: {name: virtualbox}', - 'vdi': 'volume: {backing: vdi}', - 'vmdk': 'volume: {backing: vmdk}', +partials = {'vdi': '{provider: {name: virtualbox}, volume: {backing: vdi}}', + 'vmdk': '{provider: {name: virtualbox}, volume: {backing: vmdk}}', } def test_unpartitioned_extlinux_oldstable(): std_partials = ['base', 'oldstable64', 'extlinux', 'unpartitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -18,7 +17,7 @@ def test_unpartitioned_extlinux_oldstable(): def test_msdos_extlinux_oldstable(): std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -26,7 +25,7 @@ def test_msdos_extlinux_oldstable(): def test_gpt_extlinux_oldstable(): std_partials = ['base', 'oldstable64', 'extlinux', 'gpt', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -34,7 +33,7 @@ def test_gpt_extlinux_oldstable(): def test_unpartitioned_extlinux_stable(): std_partials = ['base', 'stable64', 'extlinux', 'unpartitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -42,7 +41,7 @@ def test_unpartitioned_extlinux_stable(): def test_msdos_extlinux_stable(): std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -50,7 +49,7 @@ def test_msdos_extlinux_stable(): def test_gpt_extlinux_stable(): std_partials = ['base', 'stable64', 'extlinux', 'gpt', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -58,7 +57,7 @@ def test_gpt_extlinux_stable(): def test_msdos_grub_stable(): std_partials = ['base', 'stable64', 'grub', 'msdos', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -66,7 +65,7 @@ def test_msdos_grub_stable(): def test_gpt_grub_stable(): std_partials = ['base', 'stable64', 'grub', 'gpt', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -74,7 +73,7 @@ def test_gpt_grub_stable(): def test_unpartitioned_extlinux_unstable(): std_partials = ['base', 'unstable64', 'extlinux', 'unpartitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -82,7 +81,7 @@ def test_unpartitioned_extlinux_unstable(): def test_msdos_extlinux_unstable(): std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -90,7 +89,7 @@ def test_msdos_extlinux_unstable(): def test_gpt_extlinux_unstable(): std_partials = ['base', 'unstable64', 'extlinux', 'gpt', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -98,7 +97,7 @@ def test_gpt_extlinux_unstable(): def test_msdos_grub_unstable(): std_partials = ['base', 'unstable64', 'grub', 'msdos', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output) @@ -106,7 +105,7 @@ def test_msdos_grub_unstable(): def test_gpt_grub_unstable(): std_partials = ['base', 'unstable64', 'grub', 'gpt', 'partitioned', 'root_password'] - custom_partials = [partials['vbox'], partials['vmdk']] + custom_partials = [partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with boot_manifest(manifest_data) as instance: print(instance.console_output)