Quellcode durchsuchen

Switch to `unittest2` to be able to use new features in Python 2.6.

tags/v0.3.3
Marcio Faustino vor 10 Jahren
Ursprung
Commit
88c8fb88e0
25 geänderte Dateien mit 78 neuen und 54 gelöschten Zeilen
  1. +23
    -0
      discover_tests.py
  2. +2
    -1
      setup.py
  3. +2
    -2
      tests/_test_tokenizer.py
  4. +1
    -1
      tests/_test_tree_equality.py
  5. +2
    -2
      tests/test_argument.py
  6. +2
    -2
      tests/test_attribute.py
  7. +2
    -2
      tests/test_builder.py
  8. +2
    -2
      tests/test_comment.py
  9. +4
    -4
      tests/test_ctokenizer.py
  10. +3
    -3
      tests/test_docs.py
  11. +2
    -2
      tests/test_external_link.py
  12. +2
    -2
      tests/test_heading.py
  13. +2
    -2
      tests/test_html_entity.py
  14. +2
    -2
      tests/test_parameter.py
  15. +2
    -2
      tests/test_parser.py
  16. +3
    -3
      tests/test_pytokenizer.py
  17. +3
    -3
      tests/test_smart_list.py
  18. +3
    -3
      tests/test_string_mixin.py
  19. +2
    -2
      tests/test_tag.py
  20. +2
    -2
      tests/test_template.py
  21. +3
    -3
      tests/test_text.py
  22. +3
    -3
      tests/test_tokens.py
  23. +2
    -2
      tests/test_utils.py
  24. +2
    -2
      tests/test_wikicode.py
  25. +2
    -2
      tests/test_wikilink.py

+ 23
- 0
discover_tests.py Datei anzeigen

@@ -0,0 +1,23 @@
# -*- coding: UTF-8 -*-


"""
Discover tests using ``unittest2`.

It appears the default distutils test suite doesn't play nice with
``setUpClass`` thereby making some tests fail. Using ``unittest2``
to load tests seems to work around that issue.

http://stackoverflow.com/a/17004409/753501
"""


# Standard:
import os

# External:
import unittest2


def additional_tests():
return unittest2.defaultTestLoader.discover(os.path.dirname(__file__))

+ 2
- 1
setup.py Datei anzeigen

@@ -42,7 +42,8 @@ setup(
name = "mwparserfromhell",
packages = find_packages(exclude=("tests",)),
ext_modules = [tokenizer],
test_suite = "tests",
tests_require = ['unittest2'],
test_suite = "discover_tests",
version = __version__,
author = "Ben Kurtovic",
author_email = "ben.kurtovic@gmail.com",


+ 2
- 2
tests/_test_tokenizer.py Datei anzeigen

@@ -35,7 +35,7 @@ class _TestParseError(Exception):
class TokenizerTestCase(object):
"""A base test case for tokenizers, whose tests are loaded dynamically.

Subclassed along with unittest.TestCase to form TestPyTokenizer and
Subclassed along with unittest2.TestCase to form TestPyTokenizer and
TestCTokenizer. Tests are loaded dynamically from files in the 'tokenizer'
directory.
"""
@@ -121,7 +121,7 @@ class TokenizerTestCase(object):
if len(sys.argv) > 2 and sys.argv[1] == "--use":
for name in sys.argv[2:]:
load_file(path.join(directory, name + extension))
sys.argv = [sys.argv[0]] # So unittest doesn't try to load these
sys.argv = [sys.argv[0]] # So unittest2 doesn't try to load these
cls.skip_others = True
else:
for filename in listdir(directory):


+ 1
- 1
tests/_test_tree_equality.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
from unittest import TestCase
from unittest2 import TestCase

from mwparserfromhell.compat import range
from mwparserfromhell.nodes import (Argument, Comment, Heading, HTMLEntity,


+ 2
- 2
tests/test_argument.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Argument, Text
@@ -99,4 +99,4 @@ class TestArgument(TreeEqualityTestCase):
self.assertIs(None, node2.default)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_attribute.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Template
@@ -86,4 +86,4 @@ class TestAttribute(TreeEqualityTestCase):
self.assertRaises(ValueError, setattr, node, pad, True)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_builder.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.nodes import (Argument, Comment, ExternalLink, Heading,
HTMLEntity, Tag, Template, Text, Wikilink)
@@ -417,4 +417,4 @@ class TestBuilder(TreeEqualityTestCase):
self.assertWikicodeEqual(valid, self.builder.build(test))

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_comment.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Comment
@@ -64,4 +64,4 @@ class TestComment(TreeEqualityTestCase):
self.assertEqual("barfoo", node.contents)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 4
- 4
tests/test_ctokenizer.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

try:
from mwparserfromhell.parser._tokenizer import CTokenizer
@@ -30,8 +30,8 @@ except ImportError:

from ._test_tokenizer import TokenizerTestCase

@unittest.skipUnless(CTokenizer, "C tokenizer not available")
class TestCTokenizer(TokenizerTestCase, unittest.TestCase):
@unittest2.skipUnless(CTokenizer, "C tokenizer not available")
class TestCTokenizer(TokenizerTestCase, unittest2.TestCase):
"""Test cases for the C tokenizer."""

@classmethod
@@ -45,4 +45,4 @@ class TestCTokenizer(TokenizerTestCase, unittest.TestCase):
self.assertTrue(CTokenizer().USES_C)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 3
- 3
tests/test_docs.py Datei anzeigen

@@ -22,14 +22,14 @@

from __future__ import print_function, unicode_literals
import json
import unittest
import unittest2

import mwparserfromhell
from mwparserfromhell.compat import py3k, str

from .compat import StringIO, urlencode, urlopen

class TestDocs(unittest.TestCase):
class TestDocs(unittest2.TestCase):
"""Integration test cases for mwparserfromhell's documentation."""

def assertPrint(self, input, output):
@@ -128,4 +128,4 @@ class TestDocs(unittest.TestCase):
self.assertEqual(expected, actual)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_external_link.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import ExternalLink, Text
@@ -122,4 +122,4 @@ class TestExternalLink(TreeEqualityTestCase):
self.assertEqual("http://example.com/", str(node2))

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_heading.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Heading, Text
@@ -85,4 +85,4 @@ class TestHeading(TreeEqualityTestCase):
self.assertRaises(ValueError, setattr, node, "level", False)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_html_entity.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import HTMLEntity
@@ -165,4 +165,4 @@ class TestHTMLEntity(TreeEqualityTestCase):
self.assertEqual("\U0001F648", node4.normalize())

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_parameter.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Text
@@ -72,4 +72,4 @@ class TestParameter(TreeEqualityTestCase):
self.assertFalse(node2.showkey)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_parser.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell import parser
from mwparserfromhell.compat import range
@@ -86,4 +86,4 @@ class TestParser(TreeEqualityTestCase):
parser.use_c = restore

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 3
- 3
tests/test_pytokenizer.py Datei anzeigen

@@ -21,13 +21,13 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.parser.tokenizer import Tokenizer

from ._test_tokenizer import TokenizerTestCase

class TestPyTokenizer(TokenizerTestCase, unittest.TestCase):
class TestPyTokenizer(TokenizerTestCase, unittest2.TestCase):
"""Test cases for the Python tokenizer."""

@classmethod
@@ -41,4 +41,4 @@ class TestPyTokenizer(TokenizerTestCase, unittest.TestCase):
self.assertFalse(Tokenizer().USES_C)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 3
- 3
tests/test_smart_list.py Datei anzeigen

@@ -21,12 +21,12 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import py3k, range
from mwparserfromhell.smart_list import SmartList, _ListProxy

class TestSmartList(unittest.TestCase):
class TestSmartList(unittest2.TestCase):
"""Test cases for the SmartList class and its child, _ListProxy."""

def _test_get_set_del_item(self, builder):
@@ -387,4 +387,4 @@ class TestSmartList(unittest.TestCase):
self.assertEqual([4, 3, 2, 1.9, 1.8], child2)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 3
- 3
tests/test_string_mixin.py Datei anzeigen

@@ -23,7 +23,7 @@
from __future__ import unicode_literals
from sys import getdefaultencoding
from types import GeneratorType
import unittest
import unittest2

from mwparserfromhell.compat import bytes, py3k, py32, range, str
from mwparserfromhell.string_mixin import StringMixIn
@@ -36,7 +36,7 @@ class _FakeString(StringMixIn):
return self._data


class TestStringMixIn(unittest.TestCase):
class TestStringMixIn(unittest2.TestCase):
"""Test cases for the StringMixIn class."""

def test_docs(self):
@@ -432,4 +432,4 @@ class TestStringMixIn(unittest.TestCase):
self.assertEqual("000123", str12.zfill(6))

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_tag.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Tag, Template, Text
@@ -305,4 +305,4 @@ class TestTag(TreeEqualityTestCase):
self.assertEqual('<div/>', node)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_template.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import HTMLEntity, Template, Text
@@ -428,4 +428,4 @@ class TestTemplate(TreeEqualityTestCase):
self.assertEqual("{{foo|a=b|c=d|e=f|a=|a=b}}", node26)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 3
- 3
tests/test_text.py Datei anzeigen

@@ -21,12 +21,12 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Text

class TestText(unittest.TestCase):
class TestText(unittest2.TestCase):
"""Test cases for the Text node."""

def test_unicode(self):
@@ -71,4 +71,4 @@ class TestText(unittest.TestCase):
self.assertIsInstance(node.value, str)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 3
- 3
tests/test_tokens.py Datei anzeigen

@@ -21,12 +21,12 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import py3k
from mwparserfromhell.parser import tokens

class TestTokens(unittest.TestCase):
class TestTokens(unittest2.TestCase):
"""Test cases for the Token class and its subclasses."""

def test_issubclass(self):
@@ -105,4 +105,4 @@ class TestTokens(unittest.TestCase):
self.assertEqual(token, eval(repr(token), vars(tokens)))

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_utils.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.nodes import Template, Text
from mwparserfromhell.utils import parse_anything
@@ -59,4 +59,4 @@ class TestUtils(TreeEqualityTestCase):
self.assertRaises(ValueError, parse_anything, ["foo", [object]])

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_wikicode.py Datei anzeigen

@@ -24,7 +24,7 @@ from __future__ import unicode_literals
from functools import partial
import re
from types import GeneratorType
import unittest
import unittest2

from mwparserfromhell.compat import py3k, str
from mwparserfromhell.nodes import (Argument, Comment, Heading, HTMLEntity,
@@ -432,4 +432,4 @@ class TestWikicode(TreeEqualityTestCase):
self.assertEqual(expected.expandtabs(4), code.get_tree())

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

+ 2
- 2
tests/test_wikilink.py Datei anzeigen

@@ -21,7 +21,7 @@
# SOFTWARE.

from __future__ import unicode_literals
import unittest
import unittest2

from mwparserfromhell.compat import str
from mwparserfromhell.nodes import Text, Wikilink
@@ -99,4 +99,4 @@ class TestWikilink(TreeEqualityTestCase):
self.assertIs(None, node2.text)

if __name__ == "__main__":
unittest.main(verbosity=2)
unittest2.main(verbosity=2)

Laden…
Abbrechen
Speichern