summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin von Gagern <gagern@google.com>2022-08-19 23:49:37 -0400
committersqla-tester <sqla-tester@sqlalchemy.org>2022-08-19 23:49:37 -0400
commitdbbaad3918c7d19cb71ca4b0b7ebe12661fba47b (patch)
treee674ff5c574c27bfbde80fc0d0d5af0876bc8cdc
parent7c5b28ac47755598e8c5bdfc995eaf220132e672 (diff)
downloadmako-dbbaad3918c7d19cb71ca4b0b7ebe12661fba47b.tar.gz
Restore unit tests in classes starting with Test
https://github.com/sqlalchemy/mako/commit/7e52b60b7dac75a3c7177e69244123c0dad9e9d9 changed tests from `unittest.TestCase` to pytest collection. But since then only classes *ending* in the word `Test` were considered to be tests; classes *starting* in `Test` were not. This disabled some existing tests, and while renaming these would be a viable way to restore coverage, extending the list of test class names avoids accidentally missing similar classes in the future. The loop test classes make use of the `setUp` method, so in their current form they need to inherit from `unittest` again. Changing to pytest fixtures would be a possible future modification. This commit adds 33 tests that had been missing before: * 25 methods in 4 classes from `test_loop.py` * 2 methods in `TestTemplateAPI` from `test_template.py` * 6 methods in `TestTGPlugin` from `test_tgplugin.py` Closes: #365 Pull-request: https://github.com/sqlalchemy/mako/pull/365 Pull-request-sha: 6b5ff13dd5346f3472ac93f3af0a9da172ae1c5e Change-Id: I744b8c6f28cf485c07cd30a11c328ea7391c7d3b
-rw-r--r--setup.cfg2
-rw-r--r--test/test_loop.py7
2 files changed, 5 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg
index ddbe78c..09d84fd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,7 +75,7 @@ tag_build = dev
[tool:pytest]
addopts= --tb native -v -r fxX -p warnings
python_files=test/*test_*.py
-python_classes=*Test
+python_classes=*Test Test*
filterwarnings =
error::DeprecationWarning:test
error::DeprecationWarning:mako
diff --git a/test/test_loop.py b/test/test_loop.py
index 19d40b5..d048ed0 100644
--- a/test/test_loop.py
+++ b/test/test_loop.py
@@ -1,4 +1,5 @@
import re
+import unittest
from mako import exceptions
from mako.codegen import _FOR_LOOP
@@ -11,7 +12,7 @@ from mako.testing.fixtures import TemplateTest
from mako.testing.helpers import flatten_result
-class TestLoop:
+class TestLoop(unittest.TestCase):
def test__FOR_LOOP(self):
for statement, target_list, expression_list in (
("for x in y:", "x", "y"),
@@ -136,7 +137,7 @@ ${x} ${loop.index} <- outer loop
)
-class TestLoopStack:
+class TestLoopStack(unittest.TestCase):
def setUp(self):
self.stack = LoopStack()
self.bottom = "spam"
@@ -179,7 +180,7 @@ class TestLoopStack:
assert before == (after + 1), "Exiting a context pops the stack"
-class TestLoopContext:
+class TestLoopContext(unittest.TestCase):
def setUp(self):
self.iterable = [1, 2, 3]
self.ctx = LoopContext(self.iterable)