Skip to content

Commit

Permalink
Merge pull request #104 from gregoil/fixes_for_pretty_resources
Browse files Browse the repository at this point in the history
Fixes for pretty sub resources
  • Loading branch information
osherdp committed Oct 17, 2018
2 parents 59f3d5f + 239af9e commit 6a00d39
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Setup file for handling packaging and distribution."""
from setuptools import setup, find_packages

__version__ = "4.3.0"
__version__ = "4.3.1"

result_handlers = [
"db = rotest.core.result.handlers.db_handler:DBHandler",
Expand Down
4 changes: 3 additions & 1 deletion src/rotest/core/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

from rotest.common import core_log
from rotest.core.utils.json_parser import parse
from rotest.common.utils import get_class_fields
from rotest.management.base_resource import BaseResource
from rotest.core.runners.base_runner import BaseTestRunner
from rotest.core import TestCase, TestFlow, TestBlock, TestSuite
from rotest.core.runners.multiprocess.manager.runner import MultiprocessRunner
Expand Down Expand Up @@ -203,7 +205,7 @@ def _update_test_resources(test_element, identifiers_dict):
identifiers_dict[resource_request.name])
requests_found.add(resource_request.name)

for (field_name, field) in test_element.get_resource_requests_fields():
for (field_name, field) in get_class_fields(test_element, BaseResource):
if field_name in identifiers_dict:
field.kwargs.update(identifiers_dict[field_name])
requests_found.add(field_name)
Expand Down

0 comments on commit 6a00d39

Please sign in to comment.