11 files changed, 11 insertions, 12 deletions
diff --git a/units/somerville-BIOS.pxu b/units/somerville-BIOS.pxu
index c8eca38..5b19924 100644
--- a/units/somerville-BIOS.pxu
+++ b/units/somerville-BIOS.pxu
@@ -411,6 +411,7 @@ include:
 # The following tests are purely automated and/or lenghty stress tests.
 # They have been moved to the end of the test run to improve the testing
 # process.
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz
diff --git a/units/somerville-cert-14-04-3.pxu b/units/somerville-cert-14-04-3.pxu
index 71f09f5..82167a6 100644
--- a/units/somerville-cert-14-04-3.pxu
+++ b/units/somerville-cert-14-04-3.pxu
@@ -382,6 +382,7 @@ include:
 # The following tests are purely automated and/or lenghty stress tests.
 # They have been moved to the end of the test run to improve the testing
 # process.
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz
diff --git a/units/somerville-full.pxu b/units/somerville-full.pxu
index 596a400..54ba7e9 100644
--- a/units/somerville-full.pxu
+++ b/units/somerville-full.pxu
@@ -440,6 +440,7 @@ include:
 # Automated Tests
 # The following tests are purely automated and/or lenghty stress tests. They
 # have been moved to the end of the test run to improve the testing process.
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log 
diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index abfa04f..3076e30 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -193,8 +193,7 @@ include:
 # Automated Tests
 # The following tests are purely automated and/or lenghty stress tests. They
 # have been moved to the end of the test run to improve the testing process.
- 2013.com.canonical.certification::firmware/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log 
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log 
diff --git a/units/somerville-touch-webcam.pxu b/units/somerville-touch-webcam.pxu
index b808e53..446c5f7 100644
--- a/units/somerville-touch-webcam.pxu
+++ b/units/somerville-touch-webcam.pxu
@@ -134,8 +134,7 @@ include:
 # Automated Tests
 # The following tests are purely automated and/or lenghty stress tests. They
 # have been moved to the end of the test run to improve the testing process.
- 2013.com.canonical.certification::firmware/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log 
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log 
diff --git a/units/somerville-wireless.pxu b/units/somerville-wireless.pxu
index 82f6ee7..19cbd5e 100644
--- a/units/somerville-wireless.pxu
+++ b/units/somerville-wireless.pxu
@@ -135,8 +135,7 @@ include:
 # Automated Tests
 # The following tests are purely automated and/or lenghty stress tests. They
 # have been moved to the end of the test run to improve the testing process.
- 2013.com.canonical.certification::firmware/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log 
diff --git a/units/stella-full-14-04-3.pxu b/units/stella-full-14-04-3.pxu
index 9dd2556..8cfc094 100644
--- a/units/stella-full-14-04-3.pxu
+++ b/units/stella-full-14-04-3.pxu
@@ -103,8 +103,7 @@ include:
 #__firmware__
 # firmware tests
 2013.com.canonical.certification::__firmware__
- 2013.com.canonical.certification::firmware/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log
diff --git a/units/stella-full.pxu b/units/stella-full.pxu
index b22a1f5..e4bcb51 100644
--- a/units/stella-full.pxu
+++ b/units/stella-full.pxu
@@ -97,8 +97,7 @@ include:
 #floppy/check_fd\d
 # firmware tests
 2013.com.canonical.certification::__firmware__
- 2013.com.canonical.certification::firmware/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log
diff --git a/units/sutton-full-14-04-3.pxu b/units/sutton-full-14-04-3.pxu
index 06f56bd..7407d3d 100644
--- a/units/sutton-full-14-04-3.pxu
+++ b/units/sutton-full-14-04-3.pxu
@@ -382,6 +382,7 @@ include:
 # The following tests are purely automated and/or lenghty stress tests.
 # They have been moved to the end of the test run to improve the testing
 # process.
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz
diff --git a/units/sutton-full-14-04.pxu b/units/sutton-full-14-04.pxu
index 5eea19d..8b1ec01 100644
--- a/units/sutton-full-14-04.pxu
+++ b/units/sutton-full-14-04.pxu
@@ -371,6 +371,7 @@ include:
 # The following tests are purely automated and/or lenghty stress tests.
 # They have been moved to the end of the test run to improve the testing
 # process.
+ 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz
diff --git a/whitelists/oem-common.whitelist b/whitelists/oem-common.whitelist
index 64c6737..55934e7 100644
--- a/whitelists/oem-common.whitelist
+++ b/whitelists/oem-common.whitelist
@@ -425,8 +425,7 @@
 # Automated Tests
 # The following tests are purely automated and/or lenghty stress tests. They
 # have been moved to the end of the test run to improve the testing process.
-2013.com.canonical.certification::firmware/fwts
-2013.com.canonical.certification::firmware/fwts_logs
+2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
 2013.com.canonical.certification::firmware/fwts_wakealarm