Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-04-12 02:20:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use py.test skip function instead of nose.

Browse source
This commit is contained in:
Bastian Kleineidam 2012-09-29 20:28:16 +02:00
parent 2479c53e6c
commit 39204ea0fe
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/__init__.py
View file

@ -19,7 +19,7 @@ import subprocess
import os
import sys
import socket
from nose import SkipTest
import pytest
from contextlib import contextmanager
from linkcheck import LinkCheckerInterrupt
@ -66,7 +66,7 @@ def _need_func (testfunc, name):
def check_func (func):
def newfunc (*args, **kwargs):
if not testfunc():
raise SkipTest("%s is not available" % name)
pytest.skip("%s is not available" % name)
return func(*args, **kwargs)
newfunc.func_name = func.func_name
return newfunc
@ -192,7 +192,7 @@ def need_newsserver (server):
def check_func (func):
def newfunc (*args, **kwargs):
if not has_newsserver(server):
raise SkipTest("Newsserver `%s' is not available" % server)
pytest.skip("Newsserver `%s' is not available" % server)
return func(*args, **kwargs)
newfunc.func_name = func.func_name
return newfunc
@ -245,8 +245,7 @@ def limit_time (seconds, skip=False):
return func(*args, **kwargs)
except LinkCheckerInterrupt, msg:
if skip:
skipmsg = "time limit of %d seconds exceeded" % seconds
raise SkipTest(skipmsg)
pytest.skip("time limit of %d seconds exceeded" % seconds)
assert False, msg
new_func.func_name = func.func_name
return new_func