Commit 33a6b8e

bkalashnikovbogdandm

bkalashnikov

authored and

committed

Fix code generation test

1 parent ac567dc commit 33a6b8eCopy full SHA for 33a6b8e

File tree

-12

lines changed

-12

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,11 @@ def test_help():`
`95`	`95`	`]`
`96`	`96`
`97`	`97`
`98`		`-def load_model(code):`
`99`		`- module = types.ModuleType(uuid.uuid4().hex)`
	`98`	`+def load_model(code, module_name=''):`
	`99`	`+ module_name = module_name or uuid.uuid4().hex`
	`100`	`+ module = types.ModuleType(module_name)`
`100`	`101`	`exec(code, module.__dict__)`
	`102`	`+ sys.modules[module_name] = module`
`101`	`103`	`return module`
`102`	`104`
`103`	`105`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import imp`
`2`	`1`	`import json`
`3`	`2`	`import sys`
`4`	`3`	`from inspect import isclass`
`@@ -11,7 +10,7 @@`
`11`	`10`	`from json_to_models.models.pydantic import PydanticModelCodeGenerator`
`12`	`11`	`from json_to_models.models.structure import compose_models_flat`
`13`	`12`	`from json_to_models.registry import ModelRegistry`
`14`		`-from .test_script import test_data_path`
	`13`	`+from .test_script import test_data_path, load_model`
`15`	`14`
`16`	`15`	`test_self_validate_pydantic_data = [`
`17`	`16`	`pytest.param(test_data_path / "gists.json", list, id="gists.json"),`
`@@ -39,14 +38,9 @@ def test_self_validate_pydantic(data, data_type):`
`39`	`38`
`40`	`39`	`structure = compose_models_flat(reg.models_map)`
`41`	`40`	`code = generate_code(structure, PydanticModelCodeGenerator)`
`42`		`- module = imp.new_module("test_models")`
`43`		`- sys.modules["test_models"] = module`
`44`		`- try:`
`45`		`- exec(compile(code, "test_models.py", "exec"), module.__dict__)`
`46`		`- except Exception as e:`
`47`		`- assert not e, code`
`48`		`-`
`49`		`- import test_models`
	`41`	`+`
	`42`	`+ test_models = load_model(code, 'test_models')`
	`43`	`+`
`50`	`44`	`for name in dir(test_models):`
`51`	`45`	`cls = getattr(test_models, name)`
`52`	`46`	`if isclass(cls) and issubclass(cls, pydantic.BaseModel):`

Comments

(0)