Skip to content

Fixed the issue of test case tsm 0201 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2023
Merged

Fixed the issue of test case tsm 0201 #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions JsonPreprocessor/CJsonPreprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,21 @@ def __processImportFiles(self, input_data : dict) -> dict:
raise Exception(f"Cyclic imported json file '{abs_path_file}'!")

oJsonImport = self.jsonLoad(abs_path_file, masterFile=False)
tmpOutdict = copy.deepcopy(out_dict)
for k1, v1 in tmpOutdict.items():
for k2, v2 in oJsonImport.items():
if k2 == k1:
del out_dict[k1]
del tmpOutdict
out_dict.update(oJsonImport)

self.recursive_level = self.recursive_level - 1 # descrease recursive level
else:
tmpOutdict = copy.deepcopy(out_dict)
for k1, v1 in tmpOutdict.items():
if k1 == key:
del out_dict[k1]
del tmpOutdict
out_dict[key] = value
return out_dict

Expand Down Expand Up @@ -471,6 +482,15 @@ def __jsonUpdated(k, v, oJson, bNested, keyNested = ''):
exec(sExec, globals())
except:
raise Exception(f"Could not set variable '{k}' with value '{v}'!")

if isinstance(v, str):
sExec = "oJson['" + k.split('[', 1)[0] + "'][" + k.split('[', 1)[1] + " = \"" + v + "\""
else:
sExec = "oJson['" + k.split('[', 1)[0] + "'][" + k.split('[', 1)[1] + " = " + str(v)
try:
exec(sExec, globals())
except:
pass
else:
oJson[k] = v

Expand Down