From b70e24a848c3bc9f5f2cb6d7999b4eaf32c03f8e Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Tue, 20 Jan 2015 08:31:12 +0100 Subject: [PATCH] Switch to using 3 partitions when testing gpt+msdos Make boot partition a little bigger --- tests/integration/manifests/partitioned.yml | 4 ++-- tests/integration/virtualbox_tests.py | 24 ++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/integration/manifests/partitioned.yml b/tests/integration/manifests/partitioned.yml index e6686c4..c44eab1 100644 --- a/tests/integration/manifests/partitioned.yml +++ b/tests/integration/manifests/partitioned.yml @@ -3,9 +3,9 @@ volume: partitions: boot: filesystem: ext2 - size: 32MiB + size: 64MiB root: filesystem: ext4 - size: 864MiB + size: 832MiB swap: size: 128MiB diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py index a20aef5..ef98abc 100644 --- a/tests/integration/virtualbox_tests.py +++ b/tests/integration/virtualbox_tests.py @@ -17,7 +17,7 @@ def test_unpartitioned_extlinux_oldstable(): def test_msdos_extlinux_oldstable(): - std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] + std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -25,7 +25,7 @@ def test_msdos_extlinux_oldstable(): def test_gpt_extlinux_oldstable(): - std_partials = ['base', 'oldstable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] + std_partials = ['base', 'oldstable64', 'extlinux', 'gpt', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -34,7 +34,7 @@ def test_gpt_extlinux_oldstable(): def test_msdos_grub_oldstable(): raise SkipTest('grub install on squeeze is broken') - std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition', 'root_password'] + std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -43,7 +43,7 @@ def test_msdos_grub_oldstable(): def test_gpt_grub_oldstable(): raise SkipTest('grub install on squeeze is broken') - std_partials = ['base', 'oldstable64', 'grub', 'gpt', 'single_partition', 'root_password'] + std_partials = ['base', 'oldstable64', 'grub', 'gpt', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -59,7 +59,7 @@ def test_unpartitioned_extlinux(): def test_msdos_extlinux(): - std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] + std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -67,7 +67,7 @@ def test_msdos_extlinux(): def test_gpt_extlinux(): - std_partials = ['base', 'stable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] + std_partials = ['base', 'stable64', 'extlinux', 'gpt', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -75,7 +75,7 @@ def test_gpt_extlinux(): def test_msdos_grub(): - std_partials = ['base', 'stable64', 'grub', 'msdos', 'single_partition', 'root_password'] + std_partials = ['base', 'stable64', 'grub', 'msdos', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -83,7 +83,7 @@ def test_msdos_grub(): def test_gpt_grub(): - std_partials = ['base', 'stable64', 'grub', 'gpt', 'single_partition', 'root_password'] + std_partials = ['base', 'stable64', 'grub', 'gpt', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -99,7 +99,7 @@ def test_unpartitioned_extlinux_unstable(): def test_msdos_extlinux_unstable(): - std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'single_partition', 'root_password'] + std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -107,7 +107,7 @@ def test_msdos_extlinux_unstable(): def test_gpt_extlinux_unstable(): - std_partials = ['base', 'unstable64', 'extlinux', 'gpt', 'single_partition', 'root_password'] + std_partials = ['base', 'unstable64', 'extlinux', 'gpt', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -115,7 +115,7 @@ def test_gpt_extlinux_unstable(): def test_msdos_grub_unstable(): - std_partials = ['base', 'unstable64', 'grub', 'msdos', 'single_partition', 'root_password'] + std_partials = ['base', 'unstable64', 'grub', 'msdos', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: @@ -123,7 +123,7 @@ def test_msdos_grub_unstable(): def test_gpt_grub_unstable(): - std_partials = ['base', 'unstable64', 'grub', 'gpt', 'single_partition', 'root_password'] + std_partials = ['base', 'unstable64', 'grub', 'gpt', 'partitioned', 'root_password'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) with BootableManifest(manifest_data) as instance: