Skip to content

Commit

Permalink
Merge 592ef4f into b1c2287
Browse files Browse the repository at this point in the history
  • Loading branch information
osherdp committed Oct 14, 2018
2 parents b1c2287 + 592ef4f commit 8717077
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -54,7 +54,7 @@ scandir==1.5
simplegeneric==0.8.1
singledispatch==3.4.0.3
six==1.11.0
swaggapi==0.6.0
swaggapi==0.6.3
termcolor==1.1.0
traitlets==4.3.2
Twisted==17.5.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
@@ -1,7 +1,7 @@
"""Setup file for handling packaging and distribution."""
from setuptools import setup, find_packages

__version__ = "4.2.1"
__version__ = "4.2.2"

result_handlers = [
"db = rotest.core.result.handlers.db_handler:DBHandler",
Expand Down
2 changes: 1 addition & 1 deletion src/rotest/cli/discover.py
Expand Up @@ -11,7 +11,7 @@


BLACK_LIST = [".tox", ".git", ".idea", "setup.py"]
WHITE_LIST = ["*test*.py"]
WHITE_LIST = ["*.py"]


def is_test_class(test):
Expand Down
4 changes: 3 additions & 1 deletion src/rotest/core/flow_component.py
Expand Up @@ -137,7 +137,9 @@ def parametrize(cls, **parameters):
"""
new_common = cls.common.copy()
new_common.update(**parameters)
return type(cls.__name__, (cls,), {'common': new_common})
class_name = new_common.get('name', cls.__name__)
return type(class_name, (cls,), {'common': new_common,
'__doc__': cls.__doc__})

# Shortcut
params = parametrize
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/test_discover.py
Expand Up @@ -54,7 +54,7 @@ def test_yielding_test_files():
def test_skipping_files_by_whitelist():
with Patcher() as patcher:
patcher.fs.create_dir("root")
patcher.fs.create_file("root/some_file.py")
patcher.fs.create_file("root/some_file.txt")

assert set(get_test_files(["root"])) == set()

Expand Down

0 comments on commit 8717077

Please sign in to comment.