Port tests to py.test

Author: birkenfeld

Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 PYTHON?=python
-NOSETESTS?=nosetests
+PYTEST?=$(PYTHON) -m pytest
 FIGLEAF?=figleaf
 FIGLEAF2HTML?=figleaf2html
 DEMOOPTS?=
@@ -23,7 +23,7 @@ all:
 
 .PHONY: test
 test:
-	$(NOSETESTS)
+	$(PYTEST)
 
 .PHONY: demo
 demo:
@@ -36,7 +36,7 @@ selfdemo:
 .PHONY: coverage
 coverage:
 	rm -rf .figleaf html
-	$(FIGLEAF) `which $(NOSETESTS)`
+	$(FIGLEAF) `which $(PYTEST)`
 	$(FIGLEAF2HTML) -x figleaf_exclude
 
 .PHONY: updatecopyright

figleaf_exclude

@@ -2,7 +2,6 @@
 /System/.*.py
 /Library/Python.*/.*.py
 .*/tests/.*.py
-.*/nose.*
 .*/pil/.*
 lib/python2.*
 python-support

setup.py

@@ -35,6 +35,5 @@
             'regexlint=regexlint.cmdline:main',
         ],
       },
-      test_suite='nose.collector',
-      tests_require=['nose'],
+      tests_require=['pytest'],
 )

tests/test_charclass.py

@@ -14,6 +14,8 @@
 
 import re
 
+import pytest
+
 from regexlint.parser import Regex
 from regexlint.charclass import *
 
@@ -25,8 +27,8 @@
     (r'[0-9a-f]', None),
     (r'[\S]', r'[\S]'),
     (r'[\S\n]', r'[\S\n]'),
-    (r'[^a-zA-Z0-9_]', '[\W]'),
-    (r'[^a-zA-Z0-9]', '[\W_]'),
+    (r'[^a-zA-Z0-9_]', r'[\W]'),
+    (r'[^a-zA-Z0-9]', r'[\W_]'),
     (r'[^\S\n]', r'[\t\x0b\x0c\r ]'),  # Double negative
     (r'[\r\n]', r'[\r\n]'),
     (r'[01]', r'[01]'),
@@ -39,18 +41,18 @@
     (r'[\x00-\xff]', r'[\w\W]'),
 ]
 
-def test_examples():
-    for a, b in EXAMPLES:
-        yield runner, a, b
 
 def first_charclass(reg_text):
     r = Regex().get_parse_tree(reg_text, 0)
     return r.children[-1]
 
+
 def effective_flags(reg_text):
     return Regex().get_parse_tree(reg_text, 0).effective_flags
 
-def runner(the_input, the_output):
+
+@pytest.mark.parametrize('the_input, the_output', EXAMPLES)
+def test_examples(the_input, the_output):
     cc = first_charclass(the_input)
     codes = cc.matching_character_codes
     ignorecase = bool(effective_flags(the_input) & re.IGNORECASE)

tests/test_parser.py

@@ -18,6 +18,7 @@
 
 from unittest import TestCase
 from pygments.token import Other
+import pytest
 
 from regexlint.parser import Regex, Node, width, fmttree, \
     WHITESPACE, DIGITS, WORD
@@ -180,15 +181,12 @@ def test_complex_charclass(Self):
         #self.assertEqual(3, len(l))
 
 
-
-def reconstruct_runner(pat):
+@pytest.mark.parametrize('pat', SAMPLE_PATTERNS)
+def test_reconstruct(pat):
     r = Regex.get_parse_tree(pat)
     rec = r.reconstruct()
     assert pat == rec
 
-def test_reconstruct():
-    for p in SAMPLE_PATTERNS:
-        yield reconstruct_runner, p
 
 SRE_CATS = {sre_constants.CATEGORY_SPACE: list(map(ord, WHITESPACE)),
             sre_constants.CATEGORY_DIGIT: list(map(ord, DIGITS)),
@@ -216,7 +214,9 @@ def expand_sre_in(x):
         else:
             raise NotImplementedError("Unknown type %s" % typ)
 
-def charclass_runner(pat):
+
+@pytest.mark.parametrize('pat', CHARCLASS_PATTERNS)
+def test_charclass(pat):
     r = Regex().get_parse_tree(pat)
     regexlint_version = r.children[0].matching_character_codes
     sre_parsed = sre_parse.parse(pat)
@@ -246,7 +246,3 @@ def charclass_runner(pat):
         print('missing:', sorted(set(golden) - set(regexlint_version)))
 
         assert sorted(golden) == sorted(regexlint_version)
-
-def test_charclass():
-    for i in CHARCLASS_PATTERNS:
-        yield charclass_runner, i