changeset 5712:6b67bbc1652e

pytest migration: make pytest's parametrize functionality available To provide parameterized tests, a custom implementation is currently provided at kallithea/tests/parameterized.py because nose does not provide that out-of-the-box. pytest, on the other hand, does have a built-in 'parametrize' (note: different spelling) functionality. Therefore, once all tests have been converted to pytest, we can get rid of the custom 'parameterized' implementation. Also, the existing 'parameterized' implementation does not seem to work under pytest-style tests. This commit makes pytest's 'parametrize' decorator available alongside the custom 'parameterized' decorator. The names are confusing but it is the intention to kill the original 'parameterized' soon.
author Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
date Wed, 10 Feb 2016 18:30:13 +0100
parents 5adc4ad9ce77
children 491961dfd0c8
files kallithea/tests/__init__.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/tests/__init__.py	Wed Feb 10 18:29:43 2016 +0100
+++ b/kallithea/tests/__init__.py	Wed Feb 10 18:30:13 2016 +0100
@@ -58,9 +58,10 @@
 log = logging.getLogger(__name__)
 
 skipif = pytest.mark.skipif
+parametrize = pytest.mark.parametrize
 
 __all__ = [
-    'skipif', 'parameterized', 'environ', 'url', 'TestController', 'TestControllerPytest',
+    'skipif', 'parametrize', 'parameterized', 'environ', 'url', 'TestController', 'TestControllerPytest',
     'ldap_lib_installed', 'pam_lib_installed', 'BaseTestCase', 'init_stack',
     'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'NEW_HG_REPO', 'NEW_GIT_REPO',
     'HG_FORK', 'GIT_FORK', 'TEST_USER_ADMIN_LOGIN', 'TEST_USER_ADMIN_PASS',