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

raise proper Skip exception rather than the plugin class

Browse source
This commit is contained in:
Anders Ingemann 2015-01-19 18:40:46 +01:00
parent e5dd68acc7
commit d105d10c76
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/integration/virtualbox_tests.py
View file

@ -1,6 +1,6 @@
from manifests import merge_manifest_data from manifests import merge_manifest_data
from tools.bootable_manifest import BootableManifest from tools.bootable_manifest import BootableManifest
from nose.plugins.skip import Skip from unittest.case import SkipTest
partials = {'vbox': 'provider: {name: virtualbox}', partials = {'vbox': 'provider: {name: virtualbox}',
'vdi': 'volume: {backing: vdi}', 'vdi': 'volume: {backing: vdi}',
@ -33,7 +33,7 @@ def test_gpt_extlinux_oldstable():
def test_msdos_grub_oldstable(): def test_msdos_grub_oldstable():
raise Skip('grub install on squeeze is broken') raise SkipTest('grub install on squeeze is broken')
std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition', 'root_password'] std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition', '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)
@ -42,7 +42,7 @@ def test_msdos_grub_oldstable():
def test_gpt_grub_oldstable(): def test_gpt_grub_oldstable():
raise Skip('grub install on squeeze is broken') raise SkipTest('grub install on squeeze is broken')
std_partials = ['base', 'oldstable64', 'grub', 'gpt', 'single_partition', 'root_password'] std_partials = ['base', 'oldstable64', 'grub', 'gpt', 'single_partition', '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)