开源软件构建与测试

_service:tar_scm:python-parameterized.spec Changed

@@ -1,16 +1,15 @@
 %global srcname parameterized
 
 Name:           python-%{srcname}
-Version:        0.8.1
-Release:        2
+Version:        0.9.0
+Release:        1
 Summary:        Parameterized testing with any Python test framework
 
 License:        BSD-2-Clause
 URL:            https://pypi.python.org/pypi/parameterized
 Source0:        https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz
 
-Patch0:         parameterized-pr116-pytest4.patch
-Patch1:         remove_nose.patch
+BuildRequires:	python3-pip  python3-hatchling python3-hatch-vcs python3-wheel
 
 BuildArch:      noarch
 
@@ -32,27 +31,33 @@
 
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
+sed -r -i 's/^import mock/from unittest import mock/' parameterized/test.py
+sed -r -i 's/assert_equal\(missing/# &/' parameterized/test.py
 
 %build
-%py3_build
+%pyproject_build
 
 %install
-%py3_install
+%pyproject_install parameterized==%{version}
 
 %check
-sed -i 's|^import mock|from unittest import mock|' parameterized/test.py
 export PYTHONPATH=%{buildroot}%{python3_sitelib}
-nose2-%{python3_version} -v
-py.test-%{python3_version} -v parameterized/test.py
+nose2 -v
+pytest -v parameterized/test.py
 %{__python3} -m unittest -v parameterized.test
 
 %files -n python3-%{srcname}
 %license LICENSE.txt
-%doc CHANGELOG.txt README.rst
-%{python3_sitelib}/%{srcname}-*.egg-info/
-%{python3_sitelib}/%{srcname}/
+%doc README.rst
+%{python3_sitelib}/%{srcname}*
 
 %changelog
+* Sat May 06 2023 xu_ping <707078654@qq.com> - 0.9.0-1
+- Upgrade to 0.9.0
+
+* Tue Jan 10 2023 Ge Wang <wangge20@h-partners.com> - 0.8.1-3
+- Replace nose2-%{python3_version} with nose2 due to python-nose2 updated to version 0.12.0
+
 * Mon May 9 2022 yaoxin <yaoxin30@h-partners.com> - 0.8.1-2
 - License compliance rectification

_service:tar_scm:parameterized-pr116-pytest4.patch Deleted

@@ -1,537 +0,0 @@
-From 674f23824328709562303941e9546097b360b4fc Mon Sep 17 00:00:00 2001
-From: David Wolever <david@wolever.net>
-Date: Sat, 9 Jan 2021 16:00:47 -0500
-Subject: PATCH 1/6 Enable pytest4 (tests will fail)
-
----
- tox.ini | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: parameterized-0.8.1/tox.ini
-===================================================================
---- parameterized-0.8.1.orig/tox.ini
-+++ parameterized-0.8.1/tox.ini
-@@ -1,5 +1,5 @@
- tox
--envlist=py{27,35,36,py}-{nose,nose2,pytest2,pytest3,unit,unit2},py{37,38,39}-{nose,nose2,pytest3,unit,unit2}
-+envlist=py{27,35,36,py}-{nose,nose2,pytest2,pytest3,pytest4,unit,unit2},py{37,38,39}-{nose,nose2,pytest3,pytest4,unit,unit2}
- testenv
- deps=
-     nose
-@@ -7,13 +7,13 @@ deps=
-     nose2: nose2
-     pytest2: pytest>=2,<3
-     pytest3: pytest>=3,<4
--    #pytest4: pytest>=4,<5
-+    pytest4: pytest>=4,<5
-     unit2: unittest2
- commands=
-     nose: nosetests
-     nose2: nose2
-     pytest2: py.test parameterized/test.py
-     pytest3: py.test parameterized/test.py
--    #pytest4: py.test parameterized/test.py
-+    pytest4: py.test parameterized/test.py
-     unit: python -m unittest parameterized.test
-     unit2: unit2 parameterized.test
-Index: parameterized-0.8.1/parameterized/parameterized.py
-===================================================================
---- parameterized-0.8.1.orig/parameterized/parameterized.py
-+++ parameterized-0.8.1/parameterized/parameterized.py
-@@ -19,9 +19,14 @@ except ImportError:
-     class SkipTest(Exception):
-         pass
- 
-+try:
-+    import pytest
-+except ImportError:
-+    pytest = None
-+
- PY3 = sys.version_info0 == 3
- PY2 = sys.version_info0 == 2
--
-+PYTEST4 = pytest and pytest.__version__ >= '4.0.0'
- 
- if PY3:
-     # Python 3 doesn't have an InstanceType, so just use a dummy type.
-@@ -352,6 +357,120 @@ class parameterized(object):
-     def __call__(self, test_func):
-         self.assert_not_in_testcase_subclass()
- 
-+        input = self.get_input()
-+        wrapper = self._wrap_test_func(test_func, input)
-+        wrapper.parameterized_input = input
-+        wrapper.parameterized_func = test_func
-+        test_func.__name__ = "_parameterized_original_%s" %(test_func.__name__, )
-+
-+        return wrapper
-+
-+    def _wrap_test_func(self, test_func, input):
-+        """ Wraps a test function so that it will appropriately handle
-+            parameterization.
-+
-+            In the general case, the wrapper will enumerate the input, yielding
-+            test cases.
-+
-+            In the case of pytest4, the wrapper will use
-+            ``@pytest.mark.parametrize`` to parameterize the test function. """
-+
-+        if not input:
-+            if not self.skip_on_empty:
-+                raise ValueError(
-+                    "Parameters iterable is empty (hint: use "
-+                    "`parameterized(, skip_on_empty=True)` to skip "
-+                    "this test when the input is empty)"
-+                )
-+            return wraps(test_func)(skip_on_empty_helper)
-+
-+        if PYTEST4 and detect_runner() == "pytest":
-+            # pytest >= 4 compatibility is... a bit of work. Basically, the
-+            # only way (I can find) of implementing parameterized testing with
-+            # pytest >= 4 is through the ``@pytest.mark.parameterized``
-+            # decorator. This decorator has some strange requirements around
-+            # the name and number of arguments to the test function, so this
-+            # wrapper works around that by:
-+            # 1. Introspecting the original test function to determine the
-+            #    names and default values of all arguments.
-+            # 2. Creating a new function with the same arguments, but none
-+            #    of them are optional::
-+            #
-+            #        def foo(a, b=42): ...
-+            #
-+            #    Becomes:
-+            #
-+            #        def parameterized_pytest_wrapper_foo(a, b): ...
-+            #
-+            # 3. Merging the ``@parameterized`` parameters with the argument
-+            #    default values.
-+            # 4. Generating a list of ``pytest.param(...)`` values, and passing
-+            #    that into ``@pytest.mark.parameterized``.
-+            # Some work also needs to be done to support the documented usage
-+            # of ``mock.patch``, which also adds complexity.
-+            Undefined = object()
-+            test_func_wrapped = test_func
-+            test_func_real, mock_patchings = unwrap_mock_patch_func(test_func_wrapped)
-+            func_argspec = getargspec(test_func_real)
-+
-+            func_args = func_argspec.args
-+            if mock_patchings:
-+                func_args = func_args:-len(mock_patchings)
-+
-+            func_args_no_self = func_args
-+            if func_args_no_self:1 == "self":
-+                func_args_no_self = func_args_no_self1:
-+
-+            args_with_default = dict(
-+                (arg, Undefined)
-+                for arg in func_args_no_self
-+            )
-+            for (arg, default) in zip(reversed(func_args_no_self), reversed(func_argspec.defaults or )):
-+                args_with_defaultarg = default
-+
-+            pytest_params = 
-+            for i in input:
-+                p = dict(args_with_default)
-+                for (arg, val) in zip(func_args_no_self, i.args):
-+                    parg = val
-+                p.update(i.kwargs)
-+
-+                # Sanity check: all arguments should now be defined
-+                if any(v is Undefined for v in p.values()):
-+                    raise ValueError(
-+                        "When parameterizing function %r: no value for "
-+                        "arguments: %s with parameters %r "
-+                        "(see: 'no value for arguments' in "
-+                        "https://github.com/wolever/parameterized#faq)" %(
-+                            test_func,
-+                            ", ".join(
-+                                repr(arg)
-+                                for (arg, val) in p.items()
-+                                if val is Undefined
-+                            ),
-+                            i,
-+                        )
-+                    )
-+
-+                pytest_params.append(pytest.param(*
-+                    p.get(arg) for arg in func_args_no_self
-+                ))
-+
-+            namespace = {
-+                "__parameterized_original_test_func": test_func_wrapped,
-+            }
-+            wrapper_name = "parameterized_pytest_wrapper_%s" %(test_func.__name__, )
-+            exec(
-+                "def %s(%s, *__args): return __parameterized_original_test_func(%s, *__args)" %(
-+                    wrapper_name,
-+                    ",".join(func_args),
-+                    ",".join(func_args),
-+                ),
-+                namespace,
-+                namespace,
-+            )
-+            return pytest.mark.parametrize(",".join(func_args_no_self), pytest_params)(namespacewrapper_name)
-+
-         @wraps(test_func)
-         def wrapper(test_self=None):
-             test_cls = test_self and type(test_self)
-@@ -366,7 +485,7 @@ class parameterized(object):
-                     ) %(test_self, ))
- 
-             original_doc = wrapper.__doc__
--            for num, args in enumerate(wrapper.parameterized_input):
-+            for num, args in enumerate(input):
-                 p = param.from_decorator(args)
-                 unbound_func, nose_tuple = self.param_as_nose_tuple(test_self, test_func, num, p)
-                 try:
-@@ -383,21 +502,6 @@ class parameterized(object):
-                     if test_self is not None:
-                         delattr(test_cls, test_func.__name__)
-                     wrapper.__doc__ = original_doc
--
--        input = self.get_input()
--        if not input:
--            if not self.skip_on_empty:
--                raise ValueError(
--                    "Parameters iterable is empty (hint: use "
--                    "`parameterized(, skip_on_empty=True)` to skip "
--                    "this test when the input is empty)"
--                )

_service:tar_scm:remove_nose.patch Deleted

@@ -1,123 +0,0 @@
----
- parameterized/parameterized.py |    7 ++++---
- parameterized/test.py          |   30 ++++++++++++++++--------------
- 2 files changed, 20 insertions(+), 17 deletions(-)
-
-Index: parameterized-0.8.1/parameterized/test.py
-===================================================================
---- parameterized-0.8.1.orig/parameterized/test.py
-+++ parameterized-0.8.1/parameterized/test.py
-@@ -3,7 +3,7 @@
- import inspect
- import mock
- from unittest import TestCase
--from nose.tools import assert_equal, assert_raises
-+import pytest
- 
- from .parameterized import (
-     PY3, PY2, PYTEST4, parameterized, param,
-@@ -91,12 +91,12 @@ if not PYTEST:
-             self.actual_order = self.stack.pop(0)
- 
-         def tearDown(self):
--            missing_tests.remove("teardown_called(%s)" %(self.stack.pop(0), ))
-+            missing_tests.remove("teardown_called(%s)" % (self.stack.pop(0), ))
- 
-         @parameterized((1, ), (2, ))
-         def test_setup(self, count, *a):
--            assert_equal(self.actual_order, "setup %s" %(count, ))
--            missing_tests.remove("test_setup(%s)" %(self.actual_order, ))
-+            assert self.actual_order == "setup %s" % count
-+            missing_tests.remove("test_setup(%s)" % self.actual_order)
- 
- 
- def custom_naming_func(custom_tag, kw_name):
-@@ -248,9 +248,9 @@ class TestParamerizedOnTestCase(TestCase
-         frame_locals = frame0.f_locals
-         nose_test_method_name = frame_locals'a'0._testMethodName
-         expected_name = "test_on_TestCase2_custom_name_" + str(foo) + "_" + str(bar)
--        assert_equal(nose_test_method_name, expected_name,
--                     "Test Method name '%s' did not get customized to expected: '%s'" %
--                     (nose_test_method_name, expected_name))
-+        assert nose_test_method_name == expected_name, \
-+                     "Test Method name '%s' did not get customized to expected: '%s'" % \
-+                     (nose_test_method_name, expected_name)
-         missing_tests.remove("%s(%r, bar=%r)" %(expected_name, foo, bar))
- 
- 
-@@ -272,7 +272,7 @@ class TestParameterizedExpandDocstring(T
-         actual_docstring = test_method.__doc__
-         if rstrip:
-             actual_docstring = actual_docstring.rstrip()
--        assert_equal(actual_docstring, expected_docstring)
-+        assert actual_docstring == expected_docstring
- 
-     @parameterized.expand(param("foo"),
-                           doc_func=lambda f, n, p: "stuff")
-@@ -348,7 +348,7 @@ def test_helpful_error_on_empty_iterable
- 
- def test_skip_test_on_empty_iterable():
-     func = parameterized(, skip_on_empty=True)(lambda: None)
--    assert_raises(SkipTest, func)
-+    pytest.raises(SkipTest, func)
- 
- 
- def test_helpful_error_on_empty_iterable_input_expand():
-@@ -381,7 +381,7 @@ def test_helpful_error_on_non_iterable_i
- 
- def tearDownModule():
-     missing = sorted(list(missing_tests))
--    assert_equal(missing, )
-+    assert missing == 
- 
- def test_old_style_classes():
-     if PY3:
-@@ -433,7 +433,7 @@ class TestOldStyleClass:
- def test_parameterized_argument_value_pairs(func_params, p, expected):
-     helper = eval("lambda %s: None" %(func_params, ))
-     actual = parameterized_argument_value_pairs(helper, p)
--    assert_equal(actual, expected)
-+    assert actual == expected
- 
- 
- @parameterized(
-@@ -443,7 +443,7 @@ def test_parameterized_argument_value_pa
-     (123456789, "12...89", 4),
- )
- def test_short_repr(input, expected, n=6):
--    assert_equal(short_repr(input, n=n), expected)
-+    assert short_repr(input, n=n) == expected
- 
- @parameterized(
-     ("foo", ),
-@@ -457,7 +457,7 @@ cases_over_10 = (i, i+1) for i in range
- 
- @parameterized(cases_over_10)
- def test_cases_over_10(input, expected):
--    assert_equal(input, expected-1)
-+    assert input == expected-1
- 
- 
- @parameterized_class(("a", "b", "c"), 
-@@ -476,7 +476,7 @@ class TestParameterizedClass(TestCase):
- 
-     def _assertions(self, test_name):
-         assert hasattr(self, "a")
--        assert_equal(self.b + self.c, 3)
-+        assert self.b + self.c == 3
-         missing_tests.remove("%s:%s(%r, %r, %r)" %(
-             self.__class__.__name__,
-             test_name,
-Index: parameterized-0.8.1/parameterized/parameterized.py
-===================================================================
---- parameterized-0.8.1.orig/parameterized/parameterized.py
-+++ parameterized-0.8.1/parameterized/parameterized.py
-@@ -286,7 +286,7 @@ def default_name_func(func, num, p):
- 
- _test_runner_override = None
- _test_runner_guess = False
--_test_runners = set("unittest", "unittest2", "nose", "nose2", "pytest")
-+_test_runners = set("unittest", "unittest2", "nose2", "pytest")
- _test_runner_aliases = {
-     "_pytest": "pytest",
- }

_service Changed

_service:tar_scm:parameterized-0.8.1.tar.gz/.gitignore Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/.hgignore Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/.travis.yml Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/CHANGELOG.txt Deleted

@@ -1,121 +0,0 @@
-0.8.1 (2021-01-09)
-    * Add README and LICENSE to pypi sdist package
-      (https://github.com/wolever/parameterized/pull/114; thanks @chohner)
-
-0.8.0 (2021-01-04)
-    * Handle camelCase test names. This is an ever-so-slightly backwards
-      incompatible change, as the method for determining which methods are
-      test methods has changed from ``method_name.startswith("test_")`` to
-      ``method_name.startswith("test")``. The latter is the behavior of
-      the ``unittest`` module.
-      (thanks @bobwalker99; https://github.com/wolever/parameterized/pull/106)
-    * Fix arguments to skip_on_empty helper (thanks @bhavyakjain;
-      https://github.com/wolever/parameterized/pull/104)
-
-0.7.5 (2021-01-04)
-    * Fix crash on Python 2.7 with unicode docstrings
-      (https://github.com/wolever/parameterized/issues/109)
-    * Replace inspect.stack() with faster inspect.currentframe()
-      (https://github.com/wolever/parameterized/issues/107)
-    * Add a __version__ string to the package
-      (https://github.com/wolever/parameterized/issues/103)
-
-0.7.4 (2020-04-14)
-    * Add ``class_name_func`` option to ``@parameterized_class``
-    * Fix arguments being passed to skip_on_empty_helper (thanks @gaf3;
-      https://github.com/wolever/parameterized/issues/57)
-    * Fix tests on Python 3.8.2 (thanks @Ikke;
-      https://github.com/wolever/parameterized/pull/99)
-
-0.7.3 (2020-04-12)
-    * Fix some typos (thanks @LWprogramming, @jinnovation;
-      https://github.com/wolever/parameterized/pull/77,
-      https://github.com/wolever/parameterized/pull/80)
-    * Fix unicode handling in setup.py (thanks @sliwinski-milosz;
-      https://github.com/wolever/parameterized/pull/89)
-    * Fix Python 3.9 compat (thanks @vstinner;
-      https://github.com/wolever/parameterized/pull/94)
-
-0.7.2 (2020-04-12)
-    * Add `@parameterized_class` name function callback support (thanks
-      @duncwebb et al; https://github.com/wolever/parameterized/pull/74)
-
-0.7.1 (2019-11-19)
-    * Fix #73: calling `setUp` and `tearDown` in parameterized classes
-
-0.7.0 (2019-02-05)
-    * Added parameterized_class feature, for parameterizing entire test
-      classes (many thanks to @TobyLL for their suggestions and help testing!)
-    * Fix DeprecationWarning on `inspect.getargs` (thanks @brettdh;
-      https://github.com/wolever/parameterized/issues/67)
-
-0.6.2 (2018-03-11)
-    * Make sure that `setUp` and `tearDown` methods work correctly (#40)
-    * Raise a ValueError when input is empty (thanks @danielbradburn;
-      https://github.com/wolever/parameterized/pull/48)
-    * Fix the order when number of cases exceeds 10 (thanks @ntflc;
-      https://github.com/wolever/parameterized/pull/49)
-
-0.6.1 (2017-03-21)
-    * Rename package from nose-parameterized to parameterized. A
-      nose-parameterized package will be released with a deprecation warning.
-    * Rename testcase_func_doc and testcase_func_name methods to doc_func and
-      name_func (a DeprecationWarning will be issued, to be removed in 1.0).
-    * Include parameters in all docstrings, not just `parameterized.expand`
-      docstrings.
-    * Explicitly unwrap iterators and generators before the test run (thanks
-      @chornsby; https://github.com/wolever/nose-parameterized/pull/31)
-    * 0.6.1 instead of 0.6.0 because I'm a dumb and accidentally uploaded
-      the wrong thing to PyPI under version 0.6.0.
-
-0.5.0 (2015-06-09)
-    * Support for nose2, py.test, unittest, and unittest2
-      (nose2 support thanks to @marek-mazur;
-      https://github.com/wolever/nose-parameterized/pull/26)
-
-0.4.2 (2015-05-18)
-    * Fix bug with expand + empty arguments (thanks @jikamens;
-      https://github.com/wolever/nose-parameterized/pull/25)
-
-0.4.1 (2015-05-17)
-    * Fix bug with expand + empty docstring (thanks @jikamens;
-      https://github.com/wolever/nose-parameterized/pull/24)
-
-0.4.0 (2015-05-11)
-    * Include parameters in ``parameterized.expand`` function docstrings
-      (https://github.com/wolever/nose-parameterized/pull/22; thanks
-      @smspillaz)
-    * Drop Python 3.2 support
-
-0.3.5 (2014-11-05)
-    * Allow the names of test cases generated by ``parameterized.expand`` to
-      be customized.
-      (https://github.com/wolever/nose-parameterized/pull/19;
-      thanks @curtissiemens) 
-
-0.3.4 (2014-10-03)
-    * Use ``functools.wraps`` to wrap expanded functions
-      (https://github.com/wolever/nose-parameterized/pull/17;
-      thanks @toumorokoshi) 
-
-0.3.3 (2014-01-03)
-    * Replace unsafe characters with "_" in names generated by
-      ``@parameterized.expand``.
-
-0.3.2 (2014-01-02)
-    * Add helpful error message when used with old-style classes.
-
-0.3.1 (2013-08-01)
-    * Fix bug: `nose_parameterized.param` wasn't being imported.
-
-0.3 (2013-05-18)
-    * Add `param` class.
-    * Add explicit support for callable inputs.
-    * Update readme to more throughly describe useage.
-    * Remove un-used test helpers (`setup_logging`, `teardown_logging`,
-     `logged_messages`, `assert_logged`, `assert_no_errors_logged`,
-     `assert_contains`, `assert_not_contains`, `assert_raises`,
-     `imported_from_test`).
-
-0.2 (2013-01-15)
-    * Add Python 3 support

_service:tar_scm:parameterized-0.8.1.tar.gz/misspelling-helper Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/misspelling-helper/nose-parametrized Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/misspelling-helper/nose-parametrized/MANIFEST Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/misspelling-helper/nose-parametrized/setup.py Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/parameterized.egg-info/pbr.json Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/setup.py Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/tox.ini Deleted

_service:tar_scm:parameterized-0.8.1.tar.gz/PKG-INFO -> _service:tar_scm:parameterized-0.9.0.tar.gz/PKG-INFO Changed

@@ -1,680 +1,668 @@
 Metadata-Version: 2.1
 Name: parameterized
-Version: 0.8.1
+Version: 0.9.0
 Summary: Parameterized testing with any Python test framework
-Home-page: https://github.com/wolever/parameterized
-Author: David Wolever
-Author-email: david@wolever.net
+Author-email: David Wolever <david@wolever.net>
 License: FreeBSD
-Description: Parameterized testing with any Python test framework
-        ====================================================
-        
-        .. image:: https://img.shields.io/pypi/v/parameterized.svg
-            :alt: PyPI
-            :target: https://pypi.org/project/parameterized/
-        
-        .. image:: https://circleci.com/gh/wolever/parameterized.svg?style=svg
-            :alt: Circle CI
-            :target: https://circleci.com/gh/wolever/parameterized
-        
-        
-        Parameterized testing in Python sucks.
-        
-        ``parameterized`` fixes that. For everything. Parameterized testing for nose,
-        parameterized testing for py.test, parameterized testing for unittest.
-        
-        .. code:: python
-        
-           # test_math.py
-           from nose.tools import assert_equal
-           from parameterized import parameterized, parameterized_class
-        
-           import unittest
-           import math
-        
-           @parameterized(
-               (2, 2, 4),
-               (2, 3, 8),
-               (1, 9, 1),
-               (0, 9, 0),
-           )
-           def test_pow(base, exponent, expected):
-              assert_equal(math.pow(base, exponent), expected)
-        
-           class TestMathUnitTest(unittest.TestCase):
-              @parameterized.expand(
-                  ("negative", -1.5, -2.0),
-                  ("integer", 1, 1.0),
-                  ("large fraction", 1.6, 1),
-              )
-              def test_floor(self, name, input, expected):
-                  assert_equal(math.floor(input), expected)
-        
-           @parameterized_class(('a', 'b', 'expected_sum', 'expected_product'), 
-              (1, 2, 3, 2),
-              (5, 5, 10, 25),
-           )
-           class TestMathClass(unittest.TestCase):
-              def test_add(self):
-                 assert_equal(self.a + self.b, self.expected_sum)
-        
-              def test_multiply(self):
-                 assert_equal(self.a * self.b, self.expected_product)
-        
-           @parameterized_class(
-              { "a": 3, "expected": 2 },
-              { "b": 5, "expected": -4 },
-           )
-           class TestMathClassDict(unittest.TestCase):
-              a = 1
-              b = 1
-        
-              def test_subtract(self):
-                 assert_equal(self.a - self.b, self.expected)
-        
-        
-        With nose (and nose2)::
-        
-            $ nosetests -v test_math.py
-            test_floor_0_negative (test_math.TestMathUnitTest) ... ok
-            test_floor_1_integer (test_math.TestMathUnitTest) ... ok
-            test_floor_2_large_fraction (test_math.TestMathUnitTest) ... ok
-            test_math.test_pow(2, 2, 4, {}) ... ok
-            test_math.test_pow(2, 3, 8, {}) ... ok
-            test_math.test_pow(1, 9, 1, {}) ... ok
-            test_math.test_pow(0, 9, 0, {}) ... ok
-            test_add (test_math.TestMathClass_0) ... ok
-            test_multiply (test_math.TestMathClass_0) ... ok
-            test_add (test_math.TestMathClass_1) ... ok
-            test_multiply (test_math.TestMathClass_1) ... ok
-            test_subtract (test_math.TestMathClassDict_0) ... ok
-        
-            ----------------------------------------------------------------------
-            Ran 12 tests in 0.015s
-        
-            OK
-        
-        As the package name suggests, nose is best supported and will be used for all
-        further examples.
-        
-        
-        With py.test (version 2.0 and above)::
-        
-            $ py.test -v test_math.py
-            ============================= test session starts ==============================
-            platform darwin -- Python 3.6.1, pytest-3.1.3, py-1.4.34, pluggy-0.4.0
-            collecting ... collected 13 items
-        
-            test_math.py::test_pow::0 PASSED
-            test_math.py::test_pow::1 PASSED
-            test_math.py::test_pow::2 PASSED
-            test_math.py::test_pow::3 PASSED
-            test_math.py::TestMathUnitTest::test_floor_0_negative PASSED
-            test_math.py::TestMathUnitTest::test_floor_1_integer PASSED
-            test_math.py::TestMathUnitTest::test_floor_2_large_fraction PASSED
-            test_math.py::TestMathClass_0::test_add PASSED
-            test_math.py::TestMathClass_0::test_multiply PASSED
-            test_math.py::TestMathClass_1::test_add PASSED
-            test_math.py::TestMathClass_1::test_multiply PASSED
-            test_math.py::TestMathClassDict_0::test_subtract PASSED
-            ==================== 12 passed, 4 warnings in 0.16 seconds =====================
-        
-        With unittest (and unittest2)::
-        
-            $ python -m unittest -v test_math
-            test_floor_0_negative (test_math.TestMathUnitTest) ... ok
-            test_floor_1_integer (test_math.TestMathUnitTest) ... ok
-            test_floor_2_large_fraction (test_math.TestMathUnitTest) ... ok
-            test_add (test_math.TestMathClass_0) ... ok
-            test_multiply (test_math.TestMathClass_0) ... ok
-            test_add (test_math.TestMathClass_1) ... ok
-            test_multiply (test_math.TestMathClass_1) ... ok
-            test_subtract (test_math.TestMathClassDict_0) ... ok
-        
-            ----------------------------------------------------------------------
-            Ran 8 tests in 0.001s
-        
-            OK
-        
-        (note: because unittest does not support test decorators, only tests created
-        with ``@parameterized.expand`` will be executed)
-        
-        With green::
-        
-            $ green test_math.py -vvv
-            test_math
-              TestMathClass_1
-            .   test_method_a
-            .   test_method_b
-              TestMathClass_2
-            .   test_method_a
-            .   test_method_b
-              TestMathClass_3
-            .   test_method_a
-            .   test_method_b
-              TestMathUnitTest
-            .   test_floor_0_negative
-            .   test_floor_1_integer
-            .   test_floor_2_large_fraction
-              TestMathClass_0
-            .   test_add
-            .   test_multiply
-              TestMathClass_1
-            .   test_add
-            .   test_multiply
-              TestMathClassDict_0
-            .   test_subtract
-        
-            Ran 12 tests in 0.121s
-        
-            OK (passes=9)
-        
-        
-        Installation
-        ------------
-        
-        ::
-        
-            $ pip install parameterized
-        
-        
-        Compatibility
-        -------------
-        
-        `Yes`__ (mostly).
-        
-        __ https://travis-ci.org/wolever/parameterized
-        
-        .. list-table::
-           :header-rows: 1
-           :stub-columns: 1
-        
-           * -
-             - Py2.6
-             - Py2.7
-             - Py3.4
-             - Py3.5
-             - Py3.6

_service:tar_scm:parameterized-0.8.1.tar.gz/README.rst -> _service:tar_scm:parameterized-0.9.0.tar.gz/README.rst Changed

@@ -1,10 +1,14 @@
 Parameterized testing with any Python test framework
 ====================================================
 
-.. image:: https://img.shields.io/pypi/v/parameterized.svg
+.. image:: https://img.shields.io/pypi/v/parameterized
     :alt: PyPI
     :target: https://pypi.org/project/parameterized/
 
+.. image:: https://img.shields.io/pypi/dm/parameterized
+    :alt: PyPI - Downloads
+    :target: https://pypi.org/project/parameterized/
+
 .. image:: https://circleci.com/gh/wolever/parameterized.svg?style=svg
     :alt: Circle CI
     :target: https://circleci.com/gh/wolever/parameterized
@@ -175,33 +179,27 @@
 
 `Yes`__ (mostly).
 
-__ https://travis-ci.org/wolever/parameterized
+__ https://app.circleci.com/pipelines/github/wolever/parameterized?branch=master
 
 .. list-table::
    :header-rows: 1
    :stub-columns: 1
 
    * -
-     - Py2.6
-     - Py2.7
-     - Py3.4
-     - Py3.5
-     - Py3.6
      - Py3.7
      - Py3.8
      - Py3.9
-     - PyPy
+     - Py3.10
+     - Py3.11
+     - PyPy3
      - ``@mock.patch``
    * - nose
      - yes
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
-     - yes
-     - yes
+     - no§
+     - no§
      - yes
    * - nose2
      - yes
@@ -211,30 +209,21 @@
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
    * - py.test 2
-     - yes
-     - yes
      - no*
      - no*
      - no*
      - no*
-     - yes
-     - yes
-     - yes
-     - yes
+     - no*
+     - no*
+     - no*
    * - py.test 3
      - yes
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
-     - yes
-     - yes
+     - no*
+     - no*
      - yes
    * - py.test 4
      - no**
@@ -244,9 +233,6 @@
      - no**
      - no**
      - no**
-     - no**
-     - no**
-     - no**
    * - py.test fixtures
      - no†
      - no†
@@ -255,9 +241,6 @@
      - no†
      - no†
      - no†
-     - no†
-     - no†
-     - no†
    * - | unittest
        | (``@parameterized.expand``)
      - yes
@@ -267,29 +250,29 @@
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
    * - | unittest2
        | (``@parameterized.expand``)
      - yes
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
-     - yes
-     - yes
+     - no§
+     - no§
      - yes
 
-\*: py.test 2 does `does not appear to work (#71)`__ under Python 3. Please comment on the related issues if you are affected.
+§: nose and unittest2 - both of which were last updated in 2015 - sadly do not
+appear to support Python 3.10 or 3.11.
+
+\*: `py.test 2 does not appear to work under Python 3 (#71)`__, and
+`py.test 3 does not appear to work under Python 3.10 or 3.11 (#154)`__.
 
 \*\*: py.test 4 is not yet supported (but coming!) in `issue #34`__
 
 †: py.test fixture support is documented in `issue #81`__
 
+
 __ https://github.com/wolever/parameterized/issues/71
+__ https://github.com/wolever/parameterized/issues/154
 __ https://github.com/wolever/parameterized/issues/34
 __ https://github.com/wolever/parameterized/issues/81
 
@@ -384,7 +367,7 @@
     class AddTestCase(unittest.TestCase):
         @parameterized.expand(
             ("2 and 3", 2, 3, 5),
-            ("3 and 5", 2, 3, 5),
+            ("3 and 5", 3, 5, 8),
         )
         def test_add(self, _, a, b, expected):
             assert_equal(a + b, expected)
@@ -645,9 +628,10 @@
 FAQ
 ---
 
-What happened to ``nose-parameterized``?
-    Originally only nose was supported. But now everything is supported, and it
-    only made sense to change the name!
+What happened to Python 2.X, 3.5, and 3.6 support?
+    As of version 0.9.0, ``parameterized`` no longer supports Python 2.X, 3.5,
+    or 3.6.  Previous versions of ``parameterized`` - 0.8.1 being the latest -
+    will continue to work, but will not receive any new features or bug fixes.
 
 What do you mean when you say "nose is best supported"?
     There are small caveates with ``py.test`` and ``unittest``: ``py.test``
@@ -664,3 +648,7 @@
     You've likely installed the ``parametrized`` (note the missing *e*)
     package. Use ``parameterized`` (with the *e*) instead and you'll be all
     set.
+
+What happened to ``nose-parameterized``?
+    Originally only nose was supported. But now everything is supported, and it
+    only made sense to change the name!

_service:tar_scm:parameterized-0.8.1.tar.gz/parameterized.egg-info/PKG-INFO -> _service:tar_scm:parameterized-0.9.0.tar.gz/parameterized.egg-info/PKG-INFO Changed

@@ -1,680 +1,668 @@
 Metadata-Version: 2.1
 Name: parameterized
-Version: 0.8.1
+Version: 0.9.0
 Summary: Parameterized testing with any Python test framework
-Home-page: https://github.com/wolever/parameterized
-Author: David Wolever
-Author-email: david@wolever.net
+Author-email: David Wolever <david@wolever.net>
 License: FreeBSD
-Description: Parameterized testing with any Python test framework
-        ====================================================
-        
-        .. image:: https://img.shields.io/pypi/v/parameterized.svg
-            :alt: PyPI
-            :target: https://pypi.org/project/parameterized/
-        
-        .. image:: https://circleci.com/gh/wolever/parameterized.svg?style=svg
-            :alt: Circle CI
-            :target: https://circleci.com/gh/wolever/parameterized
-        
-        
-        Parameterized testing in Python sucks.
-        
-        ``parameterized`` fixes that. For everything. Parameterized testing for nose,
-        parameterized testing for py.test, parameterized testing for unittest.
-        
-        .. code:: python
-        
-           # test_math.py
-           from nose.tools import assert_equal
-           from parameterized import parameterized, parameterized_class
-        
-           import unittest
-           import math
-        
-           @parameterized(
-               (2, 2, 4),
-               (2, 3, 8),
-               (1, 9, 1),
-               (0, 9, 0),
-           )
-           def test_pow(base, exponent, expected):
-              assert_equal(math.pow(base, exponent), expected)
-        
-           class TestMathUnitTest(unittest.TestCase):
-              @parameterized.expand(
-                  ("negative", -1.5, -2.0),
-                  ("integer", 1, 1.0),
-                  ("large fraction", 1.6, 1),
-              )
-              def test_floor(self, name, input, expected):
-                  assert_equal(math.floor(input), expected)
-        
-           @parameterized_class(('a', 'b', 'expected_sum', 'expected_product'), 
-              (1, 2, 3, 2),
-              (5, 5, 10, 25),
-           )
-           class TestMathClass(unittest.TestCase):
-              def test_add(self):
-                 assert_equal(self.a + self.b, self.expected_sum)
-        
-              def test_multiply(self):
-                 assert_equal(self.a * self.b, self.expected_product)
-        
-           @parameterized_class(
-              { "a": 3, "expected": 2 },
-              { "b": 5, "expected": -4 },
-           )
-           class TestMathClassDict(unittest.TestCase):
-              a = 1
-              b = 1
-        
-              def test_subtract(self):
-                 assert_equal(self.a - self.b, self.expected)
-        
-        
-        With nose (and nose2)::
-        
-            $ nosetests -v test_math.py
-            test_floor_0_negative (test_math.TestMathUnitTest) ... ok
-            test_floor_1_integer (test_math.TestMathUnitTest) ... ok
-            test_floor_2_large_fraction (test_math.TestMathUnitTest) ... ok
-            test_math.test_pow(2, 2, 4, {}) ... ok
-            test_math.test_pow(2, 3, 8, {}) ... ok
-            test_math.test_pow(1, 9, 1, {}) ... ok
-            test_math.test_pow(0, 9, 0, {}) ... ok
-            test_add (test_math.TestMathClass_0) ... ok
-            test_multiply (test_math.TestMathClass_0) ... ok
-            test_add (test_math.TestMathClass_1) ... ok
-            test_multiply (test_math.TestMathClass_1) ... ok
-            test_subtract (test_math.TestMathClassDict_0) ... ok
-        
-            ----------------------------------------------------------------------
-            Ran 12 tests in 0.015s
-        
-            OK
-        
-        As the package name suggests, nose is best supported and will be used for all
-        further examples.
-        
-        
-        With py.test (version 2.0 and above)::
-        
-            $ py.test -v test_math.py
-            ============================= test session starts ==============================
-            platform darwin -- Python 3.6.1, pytest-3.1.3, py-1.4.34, pluggy-0.4.0
-            collecting ... collected 13 items
-        
-            test_math.py::test_pow::0 PASSED
-            test_math.py::test_pow::1 PASSED
-            test_math.py::test_pow::2 PASSED
-            test_math.py::test_pow::3 PASSED
-            test_math.py::TestMathUnitTest::test_floor_0_negative PASSED
-            test_math.py::TestMathUnitTest::test_floor_1_integer PASSED
-            test_math.py::TestMathUnitTest::test_floor_2_large_fraction PASSED
-            test_math.py::TestMathClass_0::test_add PASSED
-            test_math.py::TestMathClass_0::test_multiply PASSED
-            test_math.py::TestMathClass_1::test_add PASSED
-            test_math.py::TestMathClass_1::test_multiply PASSED
-            test_math.py::TestMathClassDict_0::test_subtract PASSED
-            ==================== 12 passed, 4 warnings in 0.16 seconds =====================
-        
-        With unittest (and unittest2)::
-        
-            $ python -m unittest -v test_math
-            test_floor_0_negative (test_math.TestMathUnitTest) ... ok
-            test_floor_1_integer (test_math.TestMathUnitTest) ... ok
-            test_floor_2_large_fraction (test_math.TestMathUnitTest) ... ok
-            test_add (test_math.TestMathClass_0) ... ok
-            test_multiply (test_math.TestMathClass_0) ... ok
-            test_add (test_math.TestMathClass_1) ... ok
-            test_multiply (test_math.TestMathClass_1) ... ok
-            test_subtract (test_math.TestMathClassDict_0) ... ok
-        
-            ----------------------------------------------------------------------
-            Ran 8 tests in 0.001s
-        
-            OK
-        
-        (note: because unittest does not support test decorators, only tests created
-        with ``@parameterized.expand`` will be executed)
-        
-        With green::
-        
-            $ green test_math.py -vvv
-            test_math
-              TestMathClass_1
-            .   test_method_a
-            .   test_method_b
-              TestMathClass_2
-            .   test_method_a
-            .   test_method_b
-              TestMathClass_3
-            .   test_method_a
-            .   test_method_b
-              TestMathUnitTest
-            .   test_floor_0_negative
-            .   test_floor_1_integer
-            .   test_floor_2_large_fraction
-              TestMathClass_0
-            .   test_add
-            .   test_multiply
-              TestMathClass_1
-            .   test_add
-            .   test_multiply
-              TestMathClassDict_0
-            .   test_subtract
-        
-            Ran 12 tests in 0.121s
-        
-            OK (passes=9)
-        
-        
-        Installation
-        ------------
-        
-        ::
-        
-            $ pip install parameterized
-        
-        
-        Compatibility
-        -------------
-        
-        `Yes`__ (mostly).
-        
-        __ https://travis-ci.org/wolever/parameterized
-        
-        .. list-table::
-           :header-rows: 1
-           :stub-columns: 1
-        
-           * -
-             - Py2.6
-             - Py2.7
-             - Py3.4
-             - Py3.5
-             - Py3.6

_service:tar_scm:parameterized-0.8.1.tar.gz/parameterized.egg-info/SOURCES.txt -> _service:tar_scm:parameterized-0.9.0.tar.gz/parameterized.egg-info/SOURCES.txt Changed

_service:tar_scm:parameterized-0.8.1.tar.gz/parameterized/__init__.py -> _service:tar_scm:parameterized-0.9.0.tar.gz/parameterized/__init__.py Changed

_service:tar_scm:parameterized-0.8.1.tar.gz/parameterized/parameterized.py -> _service:tar_scm:parameterized-0.9.0.tar.gz/parameterized/parameterized.py Changed

@@ -2,11 +2,20 @@
 import sys
 import inspect
 import warnings
+from typing import Iterable
 from functools import wraps
 from types import MethodType as MethodType
 from collections import namedtuple
 
 try:
+    from unittest import mock
+except ImportError:
+    try:
+        import mock
+    except ImportError:
+        mock = None
+
+try:
     from collections import OrderedDict as MaybeOrderedDict
 except ImportError:
     MaybeOrderedDict = dict
@@ -19,6 +28,9 @@
     class SkipTest(Exception):
         pass
 
+# NOTE: even though Python 2 support has been dropped, these checks have been
+# left in place to avoid merge conflicts. They can be removed in the future, and
+# future code can be written to assume Python 3.
 PY3 = sys.version_info0 == 3
 PY2 = sys.version_info0 == 2
 
@@ -82,17 +94,66 @@
         return dummy_func
 
     if hasattr(func, 'patchings'):
+        is_original_async = inspect.iscoroutinefunction(func)
         func = dummy_wrapper(func)
         tmp_patchings = func.patchings
         delattr(func, 'patchings')
         for patch_obj in tmp_patchings:
-            func = patch_obj.decorate_callable(func)
+            if is_original_async:
+                func = patch_obj.decorate_async_callable(func)
+            else:
+                func = patch_obj.decorate_callable(func)
     return func
 
 
+# `parameterized.expand` strips out `mock` patches from the source method in favor of re-applying them over the
+# generated methods instead. Sadly, this can cause problems with old versions of the `mock` package, as shown in
+# https://bugs.python.org/issue40126 (bpo-40126).
+#
+# Long story short, bpo-40126 arises whenever the `patchings` list of a `mock`-decorated method is left fully empty.
+#
+# The bug has been fixed in the `mock` code itself since:
+#   - Python 3.7.8-rc1, 3.8.3-rc1 and later (for the `unittest.mock` package) 01.
+#   - Version 4 of the `mock` backport package (https://pypi.org/project/mock/) 2.
+#
+# To work around the problem when running old `mock` versions, we avoid fully stripping out patches from the source
+# method in favor of replacing them with a "dummy" no-op patch instead.
+#
+# 0 https://docs.python.org/release/3.7.10/whatsnew/changelog.html#python-3-7-8-release-candidate-1
+# 1 https://docs.python.org/release/3.8.10/whatsnew/changelog.html#python-3-8-3-release-candidate-1
+# 2 https://mock.readthedocs.io/en/stable/changelog.html#b1
+
+PYTHON_DOESNT_HAVE_FIX_FOR_BPO_40126 = (
+    sys.version_info:3 < (3, 7, 8) or (sys.version_info:2 >= (3, 8) and sys.version_info:3 < (3, 8, 3))
+)
+
+try:
+    import mock as _mock_backport
+except ImportError:
+    _mock_backport = None
+
+MOCK_BACKPORT_DOESNT_HAVE_FIX_FOR_BPO_40126 = _mock_backport is not None and _mock_backport.version_info0 < 4
+
+AVOID_CLEARING_MOCK_PATCHES = PYTHON_DOESNT_HAVE_FIX_FOR_BPO_40126 or MOCK_BACKPORT_DOESNT_HAVE_FIX_FOR_BPO_40126
+
+
+class DummyPatchTarget(object):
+    dummy_attribute = None
+
+    @staticmethod
+    def create_dummy_patch():
+        if mock is not None:
+            return mock.patch.object(DummyPatchTarget(), "dummy_attribute", new=None)
+        else:
+            raise ImportError("Missing mock package")
+
+
 def delete_patches_if_need(func):
     if hasattr(func, 'patchings'):
-        func.patchings: = 
+        if AVOID_CLEARING_MOCK_PATCHES:
+            func.patchings: = DummyPatchTarget.create_dummy_patch()
+        else:
+            func.patchings: = 
 
 
 _param = namedtuple("param", "args kwargs")
@@ -148,7 +209,7 @@
             """
         if isinstance(args, param):
             return args
-        elif isinstance(args, string_types):
+        elif isinstance(args, (str, bytes)) or not isinstance(args, Iterable):
             args = (args, )
         try:
             return cls(*args)
@@ -300,7 +361,7 @@
 def detect_runner():
     """ Guess which test runner we're using by traversing the stack and looking
         for the first matching module. This *should* be reasonably safe, as
-        it's done during test disocvery where the test runner should be the
+        it's done during test discovery where the test runner should be the
         stack frame immediately outside. """
     if _test_runner_override is not None:
         return _test_runner_override
@@ -323,6 +384,7 @@
     return _test_runner_guess
 
 
+
 class parameterized(object):
     """ Parameterize a test case::
 
@@ -463,12 +525,29 @@
 
     @classmethod
     def expand(cls, input, name_func=None, doc_func=None, skip_on_empty=False,
-               **legacy):
+               namespace=None, **legacy):
         """ A "brute force" method of parameterizing test cases. Creates new
             test cases and injects them into the namespace that the wrapped
             function is being defined in. Useful for parameterizing tests in
             subclasses of 'UnitTest', where Nose test generators don't work.
 
+            :param input: An iterable of values to pass to the test function.
+            :param name_func: A function that takes a single argument (the
+                value from the input iterable) and returns a string to use as
+                the name of the test case. If not provided, the name of the
+                test case will be the name of the test function with the
+                parameter value appended.
+            :param doc_func: A function that takes a single argument (the
+                value from the input iterable) and returns a string to use as
+                the docstring of the test case. If not provided, the docstring
+                of the test case will be the docstring of the test function.
+            :param skip_on_empty: If True, the test will be skipped if the
+                input iterable is empty. If False, a ValueError will be raised
+                if the input iterable is empty.
+            :param namespace: The namespace (dict-like) to inject the test cases
+                into. If not provided, the namespace of the test function will
+                be used.
+
             >>> @parameterized.expand(("foo", 1, 2))
             ... def test_add1(name, input, expected):
             ...     actual = add1(input)
@@ -495,7 +574,9 @@
         name_func = name_func or default_name_func
 
         def parameterized_expand_wrapper(f, instance=None):
-            frame_locals = inspect.currentframe().f_back.f_locals
+            frame_locals = namespace
+            if frame_locals is None:
+                frame_locals = inspect.currentframe().f_back.f_locals
 
             parameters = cls.input_as_callable(input)()
 
@@ -524,13 +605,20 @@
             delete_patches_if_need(f)
 
             f.__test__ = False
+
         return parameterized_expand_wrapper
 
     @classmethod
     def param_as_standalone_func(cls, p, func, name):
-        @wraps(func)
-        def standalone_func(*a):
-            return func(*(a + p.args), **p.kwargs)
+        if inspect.iscoroutinefunction(func):
+            @wraps(func)
+            async def standalone_func(*a, **kw):
+                return await func(*(a + p.args), **p.kwargs, **kw)
+        else:
+            @wraps(func)
+            def standalone_func(*a, **kw):
+                return func(*(a + p.args), **p.kwargs, **kw)
+
         standalone_func.__name__ = name
 
         # place_as is used by py.test to determine what source file should be
@@ -548,6 +636,8 @@
 
     @classmethod
     def to_safe_name(cls, s):
+        if not isinstance(s, str):
+            s = str(s)
         return str(re.sub("^a-zA-Z0-9_+", "_", s))

_service:tar_scm:parameterized-0.8.1.tar.gz/parameterized/test.py -> _service:tar_scm:parameterized-0.9.0.tar.gz/parameterized/test.py Changed

@@ -1,19 +1,48 @@
 # coding=utf-8
 
 import inspect
+import sys
 import mock
+from functools import wraps
 from unittest import TestCase
-from nose.tools import assert_equal, assert_raises
+try:
+    from nose.tools import assert_equal, assert_raises
+except ImportError:
+    def assert_equal(*args, **kwds):
+        return TestCase().assertEqual(*args, **kwds)
+    def assert_raises(*args, **kwds):
+        return TestCase().assertRaises(*args, **kwds)
 
 from .parameterized import (
     PY3, PY2, parameterized, param, parameterized_argument_value_pairs,
     short_repr, detect_runner, parameterized_class, SkipTest,
 )
 
+
 def assert_contains(haystack, needle):
     if needle not in haystack:
         raise AssertionError("%r not in %r" %(needle, haystack))
 
+
+def assert_raises_regexp_decorator(expected_exception, expected_regexp):
+    """
+    Assert that a wrapped `unittest.TestCase` method raises an error matching the given type and message regex.
+
+    :param expected_exception: Exception class expected to be raised.
+    :param expected_regexp: Regexp (re pattern object or string) expected to be found in error message.
+    """
+
+    def func_decorator(func):
+        @wraps(func)
+        def wrapper(self, *args, **kwargs):
+            with self.assertRaisesRegexp(expected_exception, expected_regexp):
+                func(self, *args, **kwargs)
+
+        return wrapper
+
+    return func_decorator
+
+
 runner = detect_runner()
 UNITTEST = runner.startswith("unittest")
 NOSE2 = (runner == "nose2")
@@ -30,6 +59,7 @@
 
 missing_tests = set()
 
+
 def expect(skip, tests=None):
     if tests is None:
         tests = skip
@@ -38,18 +68,44 @@
         return
     missing_tests.update(tests)
 
+
+def expect_exception_matching_regex(tests, expected_exception, expected_regexp):
+    """
+    Assert that the given `unittest.TestCase` tests raise an error matching the given type and message regex.
+
+    :param tests: A single test name or list of test names.
+    :param expected_exception: Exception class expected to be raised.
+    :param expected_regexp: Regexp (re pattern object or string) expected to be found in error message.
+    """
+    if not isinstance(tests, list):
+        tests = tests
+
+    decorator = assert_raises_regexp_decorator(expected_exception, expected_regexp)
+    frame_locals = inspect.currentframe().f_back.f_locals
+
+    for test in tests:
+        if test in frame_locals:
+            test_method = frame_localstest
+            decorated_test_method = decorator(test_method)
+            frame_localstest = decorated_test_method
+
+
 test_params = 
     (42, ),
     "foo0",
+    b"bar",
+    123,
     param("foo1"),
     param("foo2", bar=42),
 
 
 expect("standalone", 
+    "test_naked_function(42, bar=None)",
     "test_naked_function('foo0', bar=None)",
+    "test_naked_function(b'bar', bar=None)",
+    "test_naked_function(123, bar=None)",
     "test_naked_function('foo1', bar=None)",
     "test_naked_function('foo2', bar=42)",
-    "test_naked_function(42, bar=None)",
 )
 
 @parameterized(test_params)
@@ -59,10 +115,12 @@
 
 class TestParameterized(object):
     expect("generator", 
+        "test_instance_method(42, bar=None)",
+        "test_instance_method(b'bar', bar=None)",
+        "test_instance_method(123, bar=None)",
         "test_instance_method('foo0', bar=None)",
         "test_instance_method('foo1', bar=None)",
         "test_instance_method('foo2', bar=42)",
-        "test_instance_method(42, bar=None)",
     )
 
     @parameterized(test_params)
@@ -97,7 +155,8 @@
 
 def custom_naming_func(custom_tag):
     def custom_naming_func(testcase_func, param_num, param):
-        return testcase_func.__name__ + ('_%s_name_' % custom_tag) + str(param.args0)
+        arg = param.args0
+        return testcase_func.__name__ + ('_%s_name_' % custom_tag) + parameterized.to_safe_name(arg)
 
     return custom_naming_func
 
@@ -181,6 +240,31 @@
                              (foo, bar, mock_umask._mock_name,
                               mock_fdopen._mock_name))
 
+    expect(
+        "test_patch_decorator_over_test_with_error('foo_this', 'umask')",
+        "test_patch_decorator_over_test_with_error('foo_that', 'umask')",
+    )
+
+    @parameterized.expand(
+        ("foo_this",),
+        ("foo_that",),
+    )
+    @mock.patch("os.umask")
+    def test_patch_decorator_over_test_with_error(self, foo, mock_umask):
+        missing_tests.remove(
+            "test_patch_decorator_over_test_with_error({!r}, {!r})".format(foo, mock_umask._mock_name)
+        )
+        raise ValueError("This error should have been caught")
+
+    expect_exception_matching_regex(
+        tests=
+            "test_patch_decorator_over_test_with_error_0_foo_this",
+            "test_patch_decorator_over_test_with_error_1_foo_that",
+        ,
+        expected_exception=ValueError,
+        expected_regexp="^This error should have been caught$",
+    )
+
 
 class TestParameterizedExpandWithNoMockPatchForClassNoExpand(object):
     expect("generator", 
@@ -207,13 +291,53 @@
         )
     )
 
+@mock.patch.multiple("os", umask=mock.DEFAULT)
+class TestParameterizedExpandWithMockPatchMultiple(TestCase):
+    expect(
+        "test_mock_patch_multiple_expand_on_method(42, 'umask', 'getpid')",
+        "test_mock_patch_multiple_expand_on_class(16, 'umask')",
+    )
+
+    @parameterized.expand((42, ))
+    @mock.patch.multiple("os", getpid=mock.DEFAULT)
+    def test_mock_patch_multiple_expand_on_method(self, param, umask, getpid):
+        missing_tests.remove(
+            "test_mock_patch_multiple_expand_on_method(%r, %r, %r)" %(
+                param, umask._mock_name, getpid._mock_name
+            )
+        )
+
+    @parameterized.expand((16, ))
+    def test_mock_patch_multiple_expand_on_class(self, param, umask):
+        missing_tests.remove(
+            "test_mock_patch_multiple_expand_on_class(%r, %r)" %(
+                param, umask._mock_name,
+            )
+        )
+
+expect("standalone", 
+    "test_mock_patch_multiple_standalone(42, 'umask', 'getpid')",
+)
+
+@parameterized((42, ))
+@mock.patch.multiple("os", umask=mock.DEFAULT, getpid=mock.DEFAULT)
+def test_mock_patch_multiple_standalone(param, umask, getpid):
+    missing_tests.remove(
+        "test_mock_patch_multiple_standalone(%r, %r, %r)" %(
+            param, umask._mock_name, getpid._mock_name
+        )
+    )

_service:tar_scm:parameterized-0.9.0.tar.gz/pyproject.toml Added

_service:tar_scm:parameterized-0.8.1.tar.gz/setup.cfg -> _service:tar_scm:parameterized-0.9.0.tar.gz/setup.cfg Changed

Changes of Revision 2