TrickOps: Revert changes to trickops test yml file from Sept 2023

* trick_sims.yml was "accidentally changed" to remove unstable sims
  in Sept 2023, breaking the TrickOps unit tests. This reverts that change.
* Adjust new hashlib md5 comparison approach to work on systems where
  'usedforsecurity' isn't supported
This commit is contained in:
Dan Jordan 2024-03-27 14:59:59 -05:00
parent 209984255e
commit 3012a9c2d6
2 changed files with 13 additions and 10 deletions
share/trick/trickops

View File

@ -1284,8 +1284,11 @@ class TrickWorkflow(WorkflowCommon):
self.status = Job.Status.FAILED
if self.missing:
return self.status
if (hashlib.md5(open(self.test_data,'rb').read(), usedforsecurity=False).hexdigest() !=
hashlib.md5(open(self.baseline_data,'rb').read(), usedforsecurity=False).hexdigest()):
td = hashlib.new('md5', usedforsecurity=False)
bd = hashlib.new('md5', usedforsecurity=False)
td.update(open(self.test_data,'rb').read())
bd.update(open(self.baseline_data,'rb').read())
if (td.hexdigest() != bd.hexdigest()):
self.status = Job.Status.FAILED
else:
self.status = Job.Status.SUCCESS

View File

@ -146,12 +146,12 @@ SIM_test_templates:
- unit_test
runs:
RUN_test/unit_test.py:
# SIM_test_varserv:
# path: test/SIM_test_varserv
# labels:
# - unit_test
# runs:
# RUN_test/unit_test.py:
SIM_test_varserv:
path: test/SIM_test_varserv
labels:
- unit_test
runs:
RUN_test/unit_test.py:
SIM_threads:
path: test/SIM_threads
labels:
@ -189,8 +189,8 @@ SIM_ball_L2:
runs:
SIM_ball_L3:
path: trick_sims/Ball/SIM_ball_L3
# SIM_amoeba:
# path: trick_sims/Cannon/SIM_amoeba
SIM_amoeba:
path: trick_sims/Cannon/SIM_amoeba
SIM_cannon_aero:
path: trick_sims/Cannon/SIM_cannon_aero
SIM_cannon_analytic: