From 8da9ac25fe95c24eeae9a5654ea05cae504ef56d Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Tue, 14 May 2013 14:20:53 +1000 Subject: [PATCH] remove unused tests/skip module part of bug 1177924 Change-Id: I9760d81b1bb52a3847cd2c6cc595dad29042a701 --- ceilometer/tests/db.py | 1 - ceilometer/tests/skip.py | 74 ---------------------------------------- 2 files changed, 75 deletions(-) delete mode 100644 ceilometer/tests/skip.py diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py index 4151c800c..ac486a902 100644 --- a/ceilometer/tests/db.py +++ b/ceilometer/tests/db.py @@ -20,7 +20,6 @@ """Base classes for API tests.""" -from nose.plugins import skip from oslo.config import cfg from ceilometer import storage diff --git a/ceilometer/tests/skip.py b/ceilometer/tests/skip.py deleted file mode 100644 index 7985dc05d..000000000 --- a/ceilometer/tests/skip.py +++ /dev/null @@ -1,74 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -"""Base classes for our unit tests. - -Allows overriding of flags for use of fakes, and some black magic for -inline callbacks. - -""" - -import functools - -import nose.plugins.skip - - -class skip_test(object): - """Decorator that skips a test.""" - # TODO(tr3buchet): remember forever what comstud did here - def __init__(self, msg): - self.message = msg - - def __call__(self, func): - @functools.wraps(func) - def _skipper(*args, **kw): - """Wrapped skipper function.""" - raise nose.SkipTest(self.message) - return _skipper - - -class skip_if(object): - """Decorator that skips a test if condition is true.""" - def __init__(self, condition, msg): - self.condition = condition - self.message = msg - - def __call__(self, func): - @functools.wraps(func) - def _skipper(*args, **kw): - """Wrapped skipper function.""" - if self.condition: - raise nose.SkipTest(self.message) - func(*args, **kw) - return _skipper - - -class skip_unless(object): - """Decorator that skips a test if condition is not true.""" - def __init__(self, condition, msg): - self.condition = condition - self.message = msg - - def __call__(self, func): - @functools.wraps(func) - def _skipper(*args, **kw): - """Wrapped skipper function.""" - if not self.condition: - raise nose.SkipTest(self.message) - func(*args, **kw) - return _skipper