diff --git a/tests/asserts.py b/tests/asserts.py deleted file mode 100644 index 4a0a379..0000000 --- a/tests/asserts.py +++ /dev/null @@ -1,36 +0,0 @@ -from nose.tools import assert_true, assert_false - - -''' -Various nose.tools helpers that doesn't exists in Python 2.6 Unittest :( -Must be removed with drop Python 2.6 support -''' - - -def assert_is_instance(obj, cls, msg=None): - """Same as assert_true(isinstance(obj, cls)), with a nicer - default message.""" - if not msg: - msg = '{orig} is not an instance of {test}'.format(orig=type(obj), test=cls) - assert_true(isinstance(obj, cls), msg=msg) - - -def assert_is_none(obj, msg=None): - """Same as assert_true(obj is None), with a nicer default message.""" - if not msg: - msg = '{orig!r} is not None'.format(orig=obj) - assert_true(obj is None, msg=msg) - - -def assert_is_not_none(obj, msg=None): - """Same as assert_false(obj is None), with a nicer default message.""" - if not msg: - msg = '{orig!r} is None'.format(orig=obj) - assert_false(obj is None, msg=msg) - - -def assert_in(member, container, msg=None): - """Just like assert_true(a in b), but with a nicer default message.""" - if not msg: - msg = '{member!r} not found in {container!r}'.format(member=member, container=container) - assert_true(member in container, msg=msg) diff --git a/tests/directives/test_block.py b/tests/directives/test_block.py index f8832f9..2ed859f 100644 --- a/tests/directives/test_block.py +++ b/tests/directives/test_block.py @@ -1,5 +1,4 @@ -from nose.tools import assert_equals, assert_true, assert_false -from tests.asserts import assert_is_instance, assert_is_none, assert_is_not_none +from nose.tools import assert_equals, assert_true, assert_false, assert_is_instance, assert_is_none, assert_is_not_none from gixy.parser.nginx_parser import NginxParser from gixy.directives.block import * diff --git a/tests/directives/test_directive.py b/tests/directives/test_directive.py index 4f62a17..e94cf2b 100644 --- a/tests/directives/test_directive.py +++ b/tests/directives/test_directive.py @@ -1,5 +1,4 @@ -from nose.tools import assert_equals, assert_false, assert_true -from tests.asserts import assert_is_instance +from nose.tools import assert_equals, assert_false, assert_true, assert_is_instance from gixy.parser.nginx_parser import NginxParser from gixy.directives.directive import * diff --git a/tests/parser/test_nginx_parser.py b/tests/parser/test_nginx_parser.py index 0f42e56..4eb209e 100644 --- a/tests/parser/test_nginx_parser.py +++ b/tests/parser/test_nginx_parser.py @@ -1,5 +1,4 @@ -from nose.tools import assert_equal -from tests.asserts import assert_is_instance +from nose.tools import assert_equal, assert_is_instance from gixy.parser.nginx_parser import NginxParser from gixy.directives.directive import * from gixy.directives.block import * diff --git a/tests/plugins/test_simply.py b/tests/plugins/test_simply.py index 1a33c63..b0451be 100644 --- a/tests/plugins/test_simply.py +++ b/tests/plugins/test_simply.py @@ -1,5 +1,4 @@ -from nose.tools import assert_equals, assert_true -from tests.asserts import assert_in +from nose.tools import assert_equals, assert_true, assert_in import os from os import path import json