providers:plainbox: recategorized fwts_test subtests

1 files changed, 53 insertions, 51 deletions

diff --git a/bin/fwts_test b/bin/fwts_test
index 1319fbdb..73a40efe 100755
--- a/bin/fwts_test
+++ b/bin/fwts_test
@@ -11,57 +11,59 @@ from syslog import *
 # These tests require user interaction and need either special handling
 # or skipping altogether (right now, we skip them but they're kept here
 # in case we figure out a way to present the interaction to the user).
-INTERACTIVE_TESTS = [
- 'ac_adapter',
- 'battery',
- 'hotkey',
- 'power_button',
- 'brightness',
- 'lid'
- ]
-TESTS = ['acpidump',
- 'acpiinfo',
- 'acpitables',
- 'apicedge',
- 'apicinstance',
- 'aspm',
- 'bios32',
- 'bios_info',
- 'checksum',
- 'crs',
- 'csm',
- 'cstates',
- 'dmar',
- 'dmicheck',
- 'ebda',
- 'fadt',
- 'fan',
- 'hda_audio',
- 'hpet_check',
- 'klog',
- 'maxfreq',
- 'maxreadreq',
- 'mcfg',
- 'method',
- 'microcode',
- 'mpcheck',
- 'msr',
- 'mtrr',
- 'nx',
- 'oops',
- 'os2gap',
- 'osilinux',
- 'pciirq',
- 'pnp',
- 'securebootcert',
- 'syntaxcheck',
- 'uefirtmisc',
- 'uefirttime',
- 'uefirtvariable',
- 'version',
- 'virt',
- 'wmi'
- ]
+INTERACTIVE_TESTS = ['ac_adapter',
+ 'battery',
+ 'hotkey',
+ 'power_button',
+ 'brightness',
+ 'lid']
+# These are usually performed on normal certification runs
+CERT_TESTS = ['acpidump',
+ 'acpitables',
+ 'apicedge',
+ 'apicinstance',
+ 'aspm',
+ 'bios32',
+ 'checksum',
+ 'cstates',
+ 'dmar',
+ 'ebda',
+ 'fadt',
+ 'hpet_check',
+ 'klog',
+ 'mcfg',
+ 'method',
+ 'mpcheck',
+ 'msr',
+ 'mtrr',
+ 'nx',
+ 'oops',
+ 'uefirtvariable',
+ 'version',
+ 'virt',
+ 'wmi']
+# These are advanced tests that shouldn't affect certification status
+NON_CERT_TESTS = ['acpiinfo',
+ 'bios_info',
+ 'crs',
+ 'csm',
+ 'dmicheck',
+ 'fan',
+ 'hda_audio',
+ 'maxfreq',
+ 'maxreadreq',
+ 'microcode',
+ 'os2gap',
+ 'osilinux',
+ 'pci',
+ 'pciirq',
+ 'pnp',
+ 'securebootcert',
+ 'smbios',
+ 'syntaxcheck',
+ 'uefirtmisc',
+ 'uefirttime']
+TESTS = sorted(CERT_TESTS + NON_CERT_TESTS)
 
 
 def get_sleep_times(start_marker, end_marker, sleep_time, resume_time):