@@ -55,6 +55,8 @@ class FWTSTest(unittest.TestCase):
5555 SUBTEST_RESULT = None
5656 CENTAURS_PRESENT = True
5757 IS_FSP_SYSTEM = False
58+ FWTS_MAJOR_VERSION = None
59+ FWTS_MINOR_VERSION = None
5860 def runTest (self ):
5961 if self .SUBTEST_RESULT is None :
6062 self .skipTest ("Test not meant to be run this way." )
@@ -71,6 +73,13 @@ def runTest(self):
7173 self .skipTest ("FWTS bug: Incorrect Missing '(status|manufacturer-id|part-number|serial-number)' property in memory-buffer/dimm" );
7274 if re .match ('property "serial-number" contains unprintable characters' , log_text ):
7375 self .skipTest ("FWTS bug: DIMM VPD has binary serial number" )
76+ if self .FWTS_MAJOR_VERSION <= 18 :
77+ # This is a guess based on when
78+ # https://lists.ubuntu.com/archives/fwts-devel/2018-April/010318.html
79+ # will be merged
80+ if self .FWTS_MAJOR_VERSION < 18 or self .FWTS_MINOR_VERSION < 5 :
81+ if re .match ('CPUFreqClaimedMax' , self .SUBTEST_RESULT .get ('failure_label' )):
82+ self .skipTest ("Bug in FWTS r.e. boost frequencies, fixed sometime after April 2018" )
7483
7584 # On FSP machines, memory-buffers (centaurs) aren't present in DT
7685 # and FWTS 17.03 (at least) expects them to be, so skip those failures
@@ -83,7 +92,7 @@ def runTest(self):
8392 self .assertEqual (self .SUBTEST_RESULT .get ('failure_label' ), 'None' , self .SUBTEST_RESULT )
8493
8594class FWTS (unittest .TestSuite ):
86- def add_fwts_results (self ):
95+ def add_fwts_results (self , major_version , minor_version ):
8796 host = self .host
8897 try :
8998 fwtsjson = host .host_run_command ('fwts -q -r stdout --log-type=json' )
@@ -119,6 +128,8 @@ def add_fwts_results(self):
119128 t = FWTSTest ()
120129 t .SUBTEST_RESULT = st_result
121130 t .CENTAURS_PRESENT = self .centaurs_present
131+ t .FWTS_MAJOR_VERSION = major_version
132+ t .FWTS_MINOR_VERSION = minor_version
122133 if self .bmc_type == 'FSP' :
123134 t .IS_FSP_SYSTEM = True
124135 suite .addTest (t )
@@ -166,6 +177,6 @@ def run(self, result):
166177 self .real_fwts_suite .addTest (checkver )
167178
168179 if checkver .version_check ():
169- self .add_fwts_results ()
180+ self .add_fwts_results (int ( major ), int ( minor ) )
170181
171182 self .real_fwts_suite .run (result )
0 commit comments