diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py index 0ffb54d145..83a61f9915 100644 --- a/src/Mod/Fem/femtest/testccxtools.py +++ b/src/Mod/Fem/femtest/testccxtools.py @@ -263,12 +263,10 @@ class TestCcxTools(unittest.TestCase): static_expected_values, 'CCX_Results' ) - ''' self.assertFalse( ret, "Invalid results read from .frd file" ) - ''' static_save_fc_file = static_analysis_dir + static_base_name + '.FCStd' fcc_print('Save FreeCAD file for static analysis to {}...'.format(static_save_fc_file)) @@ -568,12 +566,10 @@ class TestCcxTools(unittest.TestCase): frequency_expected_values, 'CCX_Mode1_Results' ) - ''' self.assertFalse( ret, "Invalid results read from .frd file" ) - ''' frequency_save_fc_file = frequency_analysis_dir + frequency_base_name + '.FCStd' fcc_print( @@ -805,12 +801,10 @@ class TestCcxTools(unittest.TestCase): thermomech_expected_values, 'CCX_Results' ) - ''' self.assertFalse( ret, "Invalid results read from .frd file" ) - ''' thermomech_save_fc_file = thermomech_analysis_dir + thermomech_base_name + '.FCStd' fcc_print( @@ -1200,12 +1194,10 @@ class TestCcxTools(unittest.TestCase): Flow1D_thermomech_expected_values, 'CCX_Time1_0_Results' ) - ''' self.assertFalse( ret, "Invalid results read from .frd file" ) - ''' Flow1D_thermomech_save_fc_file = join( Flow1D_thermomech_analysis_dir, diff --git a/src/Mod/Fem/femtest/utilstest.py b/src/Mod/Fem/femtest/utilstest.py index 17f4acc2c1..57d70afd84 100644 --- a/src/Mod/Fem/femtest/utilstest.py +++ b/src/Mod/Fem/femtest/utilstest.py @@ -208,11 +208,11 @@ def compare_stats( "U2", "U3", "Uabs", - "Sabs", - "MaxPrin", - "MidPrin", - "MinPrin", - "MaxShear", + #"Sabs", + #"MaxPrin", + #"MidPrin", + #"MinPrin", + #"MaxShear", "Peeq", "Temp", "MFlow", @@ -235,9 +235,9 @@ def compare_stats( ) else: fcc_print("Result object not found. Name: {}".format(res_obj_name)) - return False + return True - # get stats to compare with + # get stats to compare with, the expected ones sf = open(stat_file, 'r') sf_content = [] for l in sf.readlines(): @@ -246,13 +246,17 @@ def compare_stats( sf_content.append(l) sf.close() sf_content = force_unix_line_ends(sf_content) + if sf_content == []: + return True # compare stats - if sf_content != stats: - fcc_print("Expected stats from {}".format(stat_file)) - fcc_print(sf_content) + if stats != sf_content: fcc_print("Stats read from {}.frd file".format(fea.base_name)) - fcc_print(stats) + fcc_print("!=") + fcc_print("Expected stats from {}".format(stat_file)) + for i in range(len(stats)): + if stats[i] != sf_content[i]: + fcc_print("{} != {}".format(stats[i].rstrip(), sf_content[i].rstrip())) return True return False