From 0f82fbd6af55ba5402e6e492b8c0f1b3ea261934 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Mon, 19 Jan 2015 01:39:48 +0100 Subject: [PATCH] Add some GPT tests --- tests/integration/virtualbox_tests.py | 62 ++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py index 7411975..8d096fa 100644 --- a/tests/integration/virtualbox_tests.py +++ b/tests/integration/virtualbox_tests.py @@ -16,7 +16,7 @@ def test_unpartitioned_extlinux_oldstable(): print(instance.console_output) -def test_partitioned_extlinux_oldstable(): +def test_msdos_extlinux_oldstable(): std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) @@ -24,7 +24,16 @@ def test_partitioned_extlinux_oldstable(): print(instance.console_output) -def test_partitioned_grub_oldstable(): +def test_gpt_extlinux_oldstable(): + std_partials = ['base', 'oldstable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] + custom_partials = [partials['vbox'], partials['vmdk']] + manifest_data = merge_manifest_data(std_partials, custom_partials) + with BootableManifest(manifest_data) as instance: + print(instance.console_output) + + +def test_msdos_grub_oldstable(): + raise Skip('grub install on squeeze is broken') std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) @@ -32,6 +41,15 @@ def test_partitioned_grub_oldstable(): print(instance.console_output) +def test_gpt_grub_oldstable(): + raise Skip('grub install on squeeze is broken') + std_partials = ['base', 'oldstable64', 'grub', 'gpt', 'single_partition', 'root_password'] + custom_partials = [partials['vbox'], partials['vmdk']] + manifest_data = merge_manifest_data(std_partials, custom_partials) + with BootableManifest(manifest_data) as instance: + print(instance.console_output) + + def test_unpartitioned_extlinux(): std_partials = ['base', 'stable64', 'extlinux', 'unpartitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] @@ -40,7 +58,7 @@ def test_unpartitioned_extlinux(): print(instance.console_output) -def test_partitioned_extlinux(): +def test_msdos_extlinux(): std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) @@ -48,7 +66,15 @@ def test_partitioned_extlinux(): print(instance.console_output) -def test_partitioned_grub(): +def test_gpt_extlinux(): + std_partials = ['base', 'stable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] + custom_partials = [partials['vbox'], partials['vmdk']] + manifest_data = merge_manifest_data(std_partials, custom_partials) + with BootableManifest(manifest_data) as instance: + print(instance.console_output) + + +def test_msdos_grub(): std_partials = ['base', 'stable64', 'grub', 'msdos', 'single_partition', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) @@ -56,6 +82,14 @@ def test_partitioned_grub(): print(instance.console_output) +def test_gpt_grub(): + std_partials = ['base', 'stable64', 'grub', 'gpt', 'single_partition', 'root_password'] + custom_partials = [partials['vbox'], partials['vmdk']] + manifest_data = merge_manifest_data(std_partials, custom_partials) + with BootableManifest(manifest_data) as instance: + print(instance.console_output) + + def test_unpartitioned_extlinux_unstable(): std_partials = ['base', 'unstable64', 'extlinux', 'unpartitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] @@ -64,7 +98,7 @@ def test_unpartitioned_extlinux_unstable(): print(instance.console_output) -def test_partitioned_extlinux_unstable(): +def test_msdos_extlinux_unstable(): std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) @@ -72,9 +106,25 @@ def test_partitioned_extlinux_unstable(): print(instance.console_output) -def test_partitioned_grub_unstable(): +def test_gpt_extlinux_unstable(): + std_partials = ['base', 'unstable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] + custom_partials = [partials['vbox'], partials['vmdk']] + manifest_data = merge_manifest_data(std_partials, custom_partials) + with BootableManifest(manifest_data) as instance: + print(instance.console_output) + + +def test_msdos_grub_unstable(): std_partials = ['base', 'unstable64', 'grub', 'msdos', 'single_partition', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: print(instance.console_output) + + +def test_gpt_grub_unstable(): + std_partials = ['base', 'unstable64', 'grub', 'gpt', 'single_partition', 'root_password'] + custom_partials = [partials['vbox'], partials['vmdk']] + manifest_data = merge_manifest_data(std_partials, custom_partials) + with BootableManifest(manifest_data) as instance: + print(instance.console_output)