"automatic merge of lp:~cypressyew/checkbox/add-tb-monitor-generator/ by tarmac [r=sylvain-pineau][bug=1456462][author=cypressyew]"

1 files changed, 23 insertions, 17 deletions

diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index 249c1bb..1a3930b 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -175,20 +175,26 @@ command:
 Was your screen dimmed approximately to half of the maximum brightness?
 EOF
 
-plugin: manual
-id: monitor/thunderbolt
-imports: from 2013.com.canonical.plainbox import manifest
-requires: manifest.has_thunderbolt == 'True'
-_summary: Display connected via Thunderbolt
-_description:
- PURPOSE:
- This test will check your Thunderbolt port as a monitor interconnect.
- STEPS:
- 1. Connect a display (if not already connected) to the Thunderbolt port on
- your system
- 2. Switch display modes between in your Display Settings, check if it can be
- set to mirrored, extended, displayed on external or onboard only
- VERIFICATION:
- Was the desktop displayed correctly on the Thunderbolt-connected screen in
- every mode?
-
+id: monitor/generator_thunderbolt
+_description: Thunderbolt monitor test
+_summary: Thunderbolt monitor test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_thunderbolt_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ imports: from 2013.com.canonical.plainbox import manifest
+ requires: manifest.has_thunderbolt == 'True'
+ plugin: manual
+ _summary: Display connected via Thunderbolt for $product
+ _description:
+ PURPOSE:
+ This test will check your Thunderbolt port as a monitor interconnect for $product.
+ STEPS:
+ 1. Connect a display (if not already connected) to the Thunderbolt port on
+ your system
+ 2. Switch display modes between in your Display Settings, check if it can be
+ set to mirrored, extended, displayed on external or onboard only
+ VERIFICATION:
+ Was the desktop displayed correctly with $product on the Thunderbolt-connected 
+ screen in every mode?
+ EOF