Merge ~pieq/checkbox-support:1658624-fwts-tests-list-update into checkbox-support:master

Proposed by Pierre Equoy
Status: Merged
Approved by: Sylvain Pineau
Approved revision: ef7975cb957384562885a9c6074d68e90bd1d96b
Merged at revision: ecc438b440f54f3c1ad5c772755a3c118fe429e4
Proposed branch: ~pieq/checkbox-support:1658624-fwts-tests-list-update
Merge into: checkbox-support:master
Diff against target: 128 lines (+20/-59)
1 file modified
checkbox_support/scripts/fwts_test.py (+20/-59)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+315445@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Thanks for keeping our wrapper up to date. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/checkbox_support/scripts/fwts_test.py b/checkbox_support/scripts/fwts_test.py
index 6d93882..c78514f 100644
--- a/checkbox_support/scripts/fwts_test.py
+++ b/checkbox_support/scripts/fwts_test.py
@@ -18,60 +18,35 @@ INTERACTIVE_TESTS = ['ac_adapter',
18 'power_button',18 'power_button',
19 'brightness',19 'brightness',
20 'lid']20 'lid']
21# Tests recommended by the Hardware Enablement Team (HWE)
21# These are performed on QA certification runs22# These are performed on QA certification runs
22QA_TESTS = ['acpitests',23QA_TESTS = ['acpitests',
23 'acpidump',24 'apicedge',
24 'acpitables',
25 'apicinstance',
26 'aspm',25 'aspm',
27 'bios32',26 'cpufreq',
28 'dmicheck',27 'dmicheck',
29 'ebda',28 'esrt',
30 'mpcheck',29 'klog',
30 'maxfreq',
31 'msr',31 'msr',
32 'mtrr',
32 'nx',33 'nx',
33 'version']34 'oops',
34# These are advanced tests that shouldn't affect certification status35 'uefibootpath',
35NON_CERT_TESTS = ['bios_info',36 'uefirtmisc',
36 'cmosdump',37 'uefirttime',
37 'cpufreq',38 'uefirtvariable',
38 'crs',39 'version',
39 'crsdump',40 'virt']
40 'csm',
41 'ebdadump',
42 'fan',
43 'gpedump',
44 'hda_audio',
45 'maxfreq',
46 'maxreadreq',
47 'memmapdump',
48 'microcode',
49 'mpdump',
50 'os2gap',
51 'osilinux',
52 'pciirq',
53 'plddump',
54 'pnp',
55 'prsdump',
56 'romdump',
57 'securebootcert',
58 'syntaxcheck',
59 'uefidump',
60 'uefirtmisc',
61 'uefirttime',
62 'uefirtvariable',
63 'uefivarinfo',
64 'wakealarm'
65 ]
66# The following tests will record logs in a separate file for the HWE team41# The following tests will record logs in a separate file for the HWE team
67HWE_TESTS = ['mtrr',42HWE_TESTS = ['version',
43 'mtrr',
68 'virt',44 'virt',
69 'apicedge',45 'apicedge',
70 'klog',46 'klog',
71 'oops',47 'oops']
72 'uefibootpath']48# By default, we launch all the tests
73CERT_TESTS = sorted(QA_TESTS + HWE_TESTS)49TESTS = sorted(list(set(QA_TESTS + HWE_TESTS)))
74TESTS = sorted(QA_TESTS + NON_CERT_TESTS + HWE_TESTS)
7550
7651
77def get_sleep_times(start_marker, end_marker, sleep_time, resume_time):52def get_sleep_times(start_marker, end_marker, sleep_time, resume_time):
@@ -236,12 +211,6 @@ def main():
236 group.add_argument('--list',211 group.add_argument('--list',
237 action='store_true',212 action='store_true',
238 help='List all tests in fwts.')213 help='List all tests in fwts.')
239 group.add_argument('--list-cert',
240 action='store_true',
241 help='List all certification tests in fwts.')
242 group.add_argument('--list-advanced',
243 action='store_true',
244 help='List all advanced tests in fwts.')
245 group.add_argument('--list-hwe',214 group.add_argument('--list-hwe',
246 action='store_true',215 action='store_true',
247 help='List all HWE concerned tests in fwts')216 help='List all HWE concerned tests in fwts')
@@ -282,12 +251,6 @@ def main():
282 elif args.list:251 elif args.list:
283 print('\n'.join(TESTS))252 print('\n'.join(TESTS))
284 return 0253 return 0
285 elif args.list_cert:
286 print('\n'.join(CERT_TESTS))
287 return 0
288 elif args.list_advanced:
289 print('\n'.join(NON_CERT_TESTS))
290 return 0
291 elif args.list_hwe:254 elif args.list_hwe:
292 print('\n'.join(HWE_TESTS))255 print('\n'.join(HWE_TESTS))
293 return 0256 return 0
@@ -296,8 +259,6 @@ def main():
296 return 0259 return 0
297 elif args.test:260 elif args.test:
298 tests.extend(args.test)261 tests.extend(args.test)
299 elif args.all:
300 tests.extend(TESTS)
301 elif args.hwe:262 elif args.hwe:
302 tests.extend(HWE_TESTS)263 tests.extend(HWE_TESTS)
303 elif args.qa:264 elif args.qa:
@@ -335,7 +296,7 @@ def main():
335 args.resume_time = 3296 args.resume_time = 3
336 tests.extend(args.sleep)297 tests.extend(args.sleep)
337 else:298 else:
338 tests.extend(CERT_TESTS)299 tests.extend(TESTS)
339300
340 # run the tests we want301 # run the tests we want
341 if args.sleep:302 if args.sleep:

Subscribers

People subscribed via source and target branches