Skip to content

Commit 56e4b56

Browse files
Fix tests
1 parent bebd707 commit 56e4b56

59 files changed

Lines changed: 61 additions & 60 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/conductor/client/automator/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def convert_from_dict(cls: type, data: dict) -> object:
5353
if not ((str(typ).startswith('dict[') or
5454
str(typ).startswith('typing.Dict[') or
5555
str(typ).startswith('requests.structures.CaseInsensitiveDict[') or
56-
isinstance(typ, dict) or str(typ).startswith('OrderedDict['))):
56+
typ == dict or str(typ).startswith('OrderedDict['))):
5757
data = {}
5858

5959
members = inspect.signature(cls.__init__).parameters
@@ -81,7 +81,7 @@ def convert_from_dict(cls: type, data: dict) -> object:
8181
elif (str(typ).startswith('dict[') or
8282
str(typ).startswith('typing.Dict[') or
8383
str(typ).startswith('requests.structures.CaseInsensitiveDict[') or
84-
isinstance(typ, dict) or str(typ).startswith('OrderedDict[')):
84+
typ == dict or str(typ).startswith('OrderedDict[')):
8585

8686
values = {}
8787
generic_type = object
@@ -116,7 +116,7 @@ def get_value(typ: type, val: object) -> object:
116116
values.append(converted)
117117
return values
118118
elif str(typ).startswith('dict[') or str(typ).startswith(
119-
'typing.Dict[') or str(typ).startswith('requests.structures.CaseInsensitiveDict[') or isinstance(typ, dict):
119+
'typing.Dict[') or str(typ).startswith('requests.structures.CaseInsensitiveDict[') or typ == dict:
120120
values = {}
121121
for k in val:
122122
v = val[k]

tests/serdesertest/test_serdeser_action.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from conductor.client.http.models.task_details import TaskDetails
55
from conductor.client.http.models.terminate_workflow import TerminateWorkflow
66
from conductor.client.http.models.update_workflow_variables import UpdateWorkflowVariables
7-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
7+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
88
import json
99
import re
1010

tests/serdesertest/test_serdeser_authorization_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import unittest
22
import json
3-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
3+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
44

55
# Import the classes being tested
66
from conductor.client.http.models.authorization_request import AuthorizationRequest

tests/serdesertest/test_serdeser_bulk_response.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33

44
from conductor.client.http.models import BulkResponse
5-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
5+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
66

77

88
class TestBulkResponseSerDeser(unittest.TestCase):

tests/serdesertest/test_serdeser_conductor_application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33

44
from conductor.client.http.models import ConductorApplication
5-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
5+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
66

77

88

tests/serdesertest/test_serdeser_conductor_user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import unittest
33

44
from conductor.client.http.models import ConductorUser, Role, Group
5-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
5+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
66

77

88
class TestConductorUserSerDeSer(unittest.TestCase):

tests/serdesertest/test_serdeser_correlation_ids_search_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33

44
from conductor.client.http.models.correlation_ids_search_request import CorrelationIdsSearchRequest
5-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
5+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
66

77
class TestCorrelationIdsSearchRequest(unittest.TestCase):
88
"""Test case for CorrelationIdsSearchRequest class."""

tests/serdesertest/test_serdeser_create_or_update_application_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33

44
from conductor.client.http.models import CreateOrUpdateApplicationRequest
5-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
5+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
66

77

88
class TestCreateOrUpdateApplicationRequest(unittest.TestCase):

tests/serdesertest/test_serdeser_event_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33
from conductor.client.http.models.event_handler import EventHandler
44
from conductor.client.http.models.action import Action
5-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
5+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
66

77

88
class TestEventHandlerSerDe(unittest.TestCase):

tests/serdesertest/test_serdeser_external_storage_location.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import json
22
import unittest
33
from conductor.client.http.models.external_storage_location import ExternalStorageLocation
4-
from serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
4+
from tests.serdesertest.util.serdeser_json_resolver_utility import JsonTemplateResolver
55

66

77
class TestExternalStorageLocationSerDe(unittest.TestCase):

0 commit comments

Comments
 (0)