Manuel de la Pena avatar Manuel de la Pena committed 3198374

Remove the skipTest. We already use the u1trial and u1lint so lets reuse the skips.

Comments (0)

Files changed (2)

conversa/passwords/test/test_osx.py

 from twisted.trial.unittest import TestCase
 
 from conversa.passwords import osx
-from conversa.test.utils import skipTest
+
+from ubuntuone.devtools.testcases import skipTest
 
 
 class FakeCtypesValue(object):

conversa/test/utils.py

-#-*- coding: utf-8 -*-
-# Copyright (c) 2012 Conversa and other contributors,
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""Utils for the tests."""
-
-from functools import wraps
-
-from twisted.trial.unittest import TestCase, SkipTest
-
-
-def skipTest(reason):
-    """Unconditionally skip a test."""
-
-    def decorator(test_item):
-        """Decorate the test so that it is skipped."""
-        if not (isinstance(test_item, type) and
-            issubclass(test_item, TestCase)):
-
-            @wraps(test_item)
-            def skip_wrapper(*args, **kwargs):
-                """Skip a test method raising an exception."""
-                raise SkipTest(reason)
-            test_item = skip_wrapper
-
-        # tell twisted.trial.unittest to skip the test, pylint will complain
-        # since it thinks we are redefining a name out of the scope
-        # pylint: disable=W0621,W0612
-        test_item.skip = reason
-        # pylint: enable=W0621,W0612
-        # because the item was skipped, we will make sure that no
-        # services are started for it
-        if hasattr(test_item, "required_services"):
-            # pylint: disable=W0612
-            test_item.required_services = lambda *args, **kwargs: []
-            # pylint: enable=W0612
-        return test_item
-    return decorator
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.