From 8bab283540826e07afc1465189eb4c03e744a696 Mon Sep 17 00:00:00 2001 From: Cerberus Date: Wed, 25 May 2011 17:49:38 -0500 Subject: [PATCH] Added test skipper class --- nova/test.py | 16 ++++++++++++++++ nova/tests/test_virt.py | 2 ++ 2 files changed, 18 insertions(+) diff --git a/nova/test.py b/nova/test.py index 4deb2a175..106a4c12d 100644 --- a/nova/test.py +++ b/nova/test.py @@ -31,6 +31,7 @@ import uuid import unittest import mox +import nose.plugins.skip import shutil import stubout from eventlet import greenthread @@ -39,6 +40,7 @@ from nova import context from nova import db from nova import fakerabbit from nova import flags +from nova import log from nova import rpc from nova import service from nova import wsgi @@ -50,6 +52,20 @@ flags.DEFINE_string('sqlite_clean_db', 'clean.sqlite', flags.DEFINE_bool('fake_tests', True, 'should we use everything for testing') +LOG = log.getLogger('nova.tests') + +class skip_test(object): + """Decorator that skips a test""" + def __init__(self, msg): + self.message = msg + + def __call__(self, func): + def _skipper(*args, **kw): + """Wrapped skipper function.""" + raise nose.SkipTest(self.message) + _skipper.__name__ = func.__name__ + _skipper.__doc__ = func.__doc__ + return _skipper def skip_if_fake(func): """Decorator that skips a test if running in fake mode.""" diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index 91c530f12..8f6c2af1a 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -879,6 +879,8 @@ class IptablesFirewallTestCase(test.TestCase): self.assertEquals(ipv6_network_rules, ipv6_rules_per_network * networks_count) + + @test.skip_test("skipping libvirt tests") def test_do_refresh_security_group_rules(self): instance_ref = self._create_instance_ref() self.mox.StubOutWithMock(self.fw,