From d105d10c76a53b175cc43161f8215559341d5047 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Mon, 19 Jan 2015 18:40:46 +0100 Subject: [PATCH] raise proper Skip exception rather than the plugin class --- tests/integration/virtualbox_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py index 8d096fa..a20aef5 100644 --- a/tests/integration/virtualbox_tests.py +++ b/tests/integration/virtualbox_tests.py @@ -1,6 +1,6 @@ from manifests import merge_manifest_data from tools.bootable_manifest import BootableManifest -from nose.plugins.skip import Skip +from unittest.case import SkipTest partials = {'vbox': 'provider: {name: virtualbox}', 'vdi': 'volume: {backing: vdi}', @@ -33,7 +33,7 @@ def test_gpt_extlinux_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'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials) @@ -42,7 +42,7 @@ def test_msdos_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'] custom_partials = [partials['vbox'], partials['vmdk']] manifest_data = merge_manifest_data(std_partials, custom_partials)