From f64ad63e4b660a38c4db30362313862fdfe54e9a Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Fri, 13 Mar 2015 12:08:59 +0800
Subject: suspend.txt.in: adding cycle resolution test for hybrid graphic
 systems

---
 jobs/suspend.txt.in | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 55fe957..88f9e16 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -1303,6 +1303,28 @@ _description:
  VERIFICATION:
      Did your display look fine in the detected mode?
 
+plugin: local
+id: suspend/generator_cycle_resolutions_after_suspend
+requires: device.category == 'VIDEO'
+_description: Cycle resolution after suspend tests
+_summary: Cycle resolution after suspend tests
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-interact-verify
+ id: suspend/`echo ${index}`_cycle_resolutions_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ estimated_duration: 120.0
+ requires: package.name == 'xorg'
+ depends: suspend/suspend_advanced
+ command: xrandr_cycle --keyword=`echo ${index}`_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'` --screenshot-dir $PLAINBOX_SESSION_SHARE
+ _description:
+  PURPOSE:
+      This test will cycle through the detected display modes
+  STEPS:
+      1. Click "Test" and the display will cycle trough the display modes
+  VERIFICATION:
+      Did your display look fine in the detected mode?
+ EOF
+
 plugin: shell
 id: suspend/cycle_resolutions_after_suspend_auto
 estimated_duration: 1.2
-- 
cgit v1.2.3


From 3ccd016813f9c14456278b3a3b0096e5193bf396 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Mon, 16 Mar 2015 15:07:41 +0800
Subject: Fixing xrandr attachment job for cycle resolution

---
 jobs/suspend.txt.in | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 88f9e16..d84ef83 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -1341,6 +1341,19 @@ depends: suspend/cycle_resolutions_after_suspend
 command: [ -e $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
 
+plugin: local
+id: suspend/generator_xrandr_screens_after_suspend.tar_gz
+_description: Attach screenshots from the suspend/cycle_resolution_after_suspend test to the results submission.
+_summary: Attach screenshots from the suspend/cycle_resolution_after_suspend test to the results submission.
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: attachment
+ id: suspend/`echo ${index}`_xrandr_screens_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tar_gz
+ depends: suspend/`echo ${index}`_cycle_resolutions_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_xrandr_screens_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz ] && cat $PLAINBOX_SESSION_SHARE/`echo ${index}`_xrandr_screens_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz
+ _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
+ EOF
+
 plugin: shell
 id: suspend/record_playback_after_suspend
 estimated_duration: 10.0
-- 
cgit v1.2.3


From c8f18bd56326b8bb2a322fc69ce0a6c3d1911b51 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Mon, 16 Mar 2015 16:17:59 +0800
Subject: xrandr_screens_after_suspend: the attachments have a prefix -
 xrandr_screens, card number should go after it

---
 jobs/suspend.txt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index d84ef83..01cb349 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -1350,7 +1350,7 @@ command:
  plugin: attachment
  id: suspend/`echo ${index}`_xrandr_screens_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tar_gz
  depends: suspend/`echo ${index}`_cycle_resolutions_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
- command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_xrandr_screens_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz ] && cat $PLAINBOX_SESSION_SHARE/`echo ${index}`_xrandr_screens_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz
+ command: [ -e $PLAINBOX_SESSION_SHARE/xrandr_screens_`echo ${index}`_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_`echo ${index}`_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz
  _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
  EOF
 
-- 
cgit v1.2.3


From 7a0dbb37f4b3536545bfb6b70629256efcc47875 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Mon, 16 Mar 2015 17:47:42 +0800
Subject: Dividing resolution tests into two-graphic-cards-specific jobs

---
 jobs/suspend.txt.in | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 01cb349..d570945 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -11,6 +11,19 @@ estimated_duration: 1.2
 _description: Record the current resolution before suspending.
 command: xrandr -q |grep '*'| awk '{print $1}' > $PLAINBOX_SESSION_SHARE/resolution_before_suspend.txt
 
+plugin: local
+id: suspend/generator_resolution_before_suspend
+_description: Record the current resolution before suspending.
+_summary: Record the current resolution before suspending.
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: suspend/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ estimated_duration: 1.2
+ _description: Record the current resolution before suspending.
+ command: xrandr -q |grep '*'| awk '{print $1}' > $PLAINBOX_SESSION_SHARE/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.txt
+ EOF
+
 plugin: shell
 id: suspend/audio_before_suspend
 estimated_duration: 1.0
@@ -406,6 +419,19 @@ estimated_duration: 1.2
 _description: Test to see that we have the same resolution after resuming as before.
 command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/resolution_before_suspend.txt -
 
+plugin: local
+id: suspend/generator_resolution_after_suspend
+_description: Test to see that we have the same resolution after resuming as before.
+_summary: Test to see that we have the same resolution after resuming as before.
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: shell
+ id: suspend/`echo ${index}`_resolution_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ estimated_duration: 1.2
+ _description: Test to see that we have the same resolution after resuming as before.
+ command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.txt -
+ EOF
+
 plugin: shell
 id: suspend/audio_after_suspend
 estimated_duration: 1.0
@@ -1350,8 +1376,8 @@ command:
  plugin: attachment
  id: suspend/`echo ${index}`_xrandr_screens_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tar_gz
  depends: suspend/`echo ${index}`_cycle_resolutions_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
- command: [ -e $PLAINBOX_SESSION_SHARE/xrandr_screens_`echo ${index}`_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_`echo ${index}`_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz
  _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
+ command: [ -e $PLAINBOX_SESSION_SHARE/xrandr_screens_`echo ${index}`_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_`echo ${index}`_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.tgz
  EOF
 
 plugin: shell
-- 
cgit v1.2.3


From 67338835daad9b77bffa715ba1ccdad3ee5b4114 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Tue, 17 Mar 2015 14:59:46 +0800
Subject: Change the dependency of suspend_after_switch_to_card job

---
 jobs/suspend.txt.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index d570945..137afe6 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -284,7 +284,7 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: user-interact-verify
  id: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
- depends: suspend/suspend_advanced
+ depends: graphics/`echo ${index}`_switch_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  user: root
  environ: PLAINBOX_SESSION_SHARE
  command:
@@ -421,8 +421,8 @@ command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/re
 
 plugin: local
 id: suspend/generator_resolution_after_suspend
-_description: Test to see that we have the same resolution after resuming as before.
-_summary: Test to see that we have the same resolution after resuming as before.
+_description: Resolution consistency check after suspend with the valuse we got before suspend.
+_summary: Resolution consistency check after suspend with the valuse we got before suspend.
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: shell
-- 
cgit v1.2.3


From 73b271ef5d74794746334c2bcd11e5e33bf2bcdb Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Tue, 17 Mar 2015 19:09:35 +0800
Subject: resolution_after_suspend: Adding dependency, it will depends on
 resolution_before_suspend

---
 jobs/suspend.txt.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 137afe6..64a10bb 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -428,6 +428,7 @@ command:
  plugin: shell
  id: suspend/`echo ${index}`_resolution_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  estimated_duration: 1.2
+ depends: suspend/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  _description: Test to see that we have the same resolution after resuming as before.
  command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.txt -
  EOF
-- 
cgit v1.2.3


From 51639d8346b24cb7217542e2e5c99f743bf87abd Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Wed, 18 Mar 2015 10:01:32 +0800
Subject: resolution_before_suspend: adding switch_card job dependency to it

---
 jobs/suspend.txt.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 64a10bb..03c4059 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -19,6 +19,7 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: shell
  id: suspend/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: graphics/`echo ${index}`_switch_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  estimated_duration: 1.2
  _description: Record the current resolution before suspending.
  command: xrandr -q |grep '*'| awk '{print $1}' > $PLAINBOX_SESSION_SHARE/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.txt
-- 
cgit v1.2.3


From 91cb32d3c9e0d757e5253353118a1b6e5a9f2c2d Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Thu, 16 Apr 2015 16:09:57 +0800
Subject: monitor job converted into local jobs for hybrid graphic stuff

---
 jobs/audio.txt.in    |  70 +++++++------
 jobs/graphics.txt.in |  36 ++++---
 jobs/monitor.txt.in  | 273 +++++++++++++++++++++++++++++++--------------------
 3 files changed, 232 insertions(+), 147 deletions(-)

(limited to 'jobs')

diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index 69367de..d29213f 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -34,53 +34,67 @@ _description:
  VERIFICATION:
      Did you hear a tone?
 
-plugin: user-interact-verify
-id: audio/playback_hdmi
-estimated_duration: 30.0
+id: audio/generator_playback_hdmi
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  package.name == 'pulseaudio-utils'
+_description: Job generator for HDMI audio test
+_summary: Job generator for HDMI audio test
+plugin: local
 command:
- audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
- audio_settings set --verbose --device=hdmi --volume=50
- gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'
- EXIT_CODE=$?
- audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
- exit $EXIT_CODE
-_description:
- PURPOSE:
-     HDMI audio interface verification
- STEPS:
-     1. Plug an external HDMI device with sound (Use only one HDMI/DisplayPort interface at a time for this test)
-     2. Click the Test button
- VERIFICATION:
-     Did you hear the sound from the HDMI device?
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: audio/`echo ${index}`_playback_hdmi_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: user-interact-verify
+ estimated_duration: 30.0
+ command:
+  audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
+  audio_settings set --verbose --device=hdmi --volume=50
+  gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'
+  EXIT_CODE=$?
+  audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
+  exit $EXIT_CODE
+ _description:
+  PURPOSE:
+      HDMI audio interface verification
+  STEPS:
+      1. Plug an external HDMI device with sound (Use only one HDMI/DisplayPort interface at a time for this test)
+      2. Click the Test button
+  VERIFICATION:
+      Did you hear the sound from the HDMI device?
+ EOF
 
-plugin: user-interact-verify
-id: audio/playback_displayport
-estimated_duration: 30.0
+id: audio/generator_playback_displayport
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  package.name == 'pulseaudio-utils'
+_description: Job generator for HDMI audio test
+_summary: Job generator for HDMI audio test
+plugin: local
 command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: audio/`echo ${index}`_playback_displayport_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: user-interact-verify
+ estimated_duration: 30.0
+ command:
   audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
   audio_settings set --verbose --device=hdmi --volume=50
   gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'
   EXIT_CODE=$?
   audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
   exit $EXIT_CODE
-_description:
- PURPOSE:
-     DisplayPort audio interface verification
- STEPS:
-     1. Plug an external DisplayPort device with sound (Use only one HDMI/DisplayPort interface at a time for this test)
-     2. Click the Test button
- VERIFICATION:
-     Did you hear the sound from the DisplayPort device?
+ _description:
+  PURPOSE:
+      DisplayPort audio interface verification
+  STEPS:
+      1. Plug an external DisplayPort device with sound (Use only one HDMI/DisplayPort interface at a time for this test)
+      2. Click the Test button
+  VERIFICATION:
+      Did you hear the sound from the DisplayPort device?
+ EOF
 
 plugin: user-interact-verify
 id: audio/playback_headphones
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index b2cd951..5750bf1 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -221,20 +221,28 @@ command:
  _summary: Test graphic memory info for $product.
  EOF
 
-plugin: user-interact-verify
-id: graphics/display
-requires:
- package.name == 'xorg'
- package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
-command: gst_pipeline_test -t 2 'videotestsrc ! videoconvert ! autovideosink' || gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! autovideosink' 
-_summary: Test that video can be displayed
-_description:
- PURPOSE:
-     This test will test the default display
- STEPS:
-     1. Click "Test" to display a video test.
- VERIFICATION:
-     Do you see color bars and static?
+id: graphics/generator_display
+requires: device.category == 'VIDEO'
+_description: Job generator for display test
+_summary: Job generator for display test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: graphics/`echo ${index}`_display_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: user-interact-verify
+ requires:
+  package.name == 'xorg'
+  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
+ command: gst_pipeline_test -t 2 'videotestsrc ! videoconvert ! autovideosink' || gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! autovideosink'
+ _summary: Test that video can be displayed
+ _description:
+  PURPOSE:
+      This test will test the default display
+  STEPS:
+      1. Click "Test" to display a video test.
+  VERIFICATION:
+      Do you see color bars and static?
+ EOF
 
 plugin: shell
 id: graphics/VESA_drivers_not_in_use
diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index d353c31..98a68bd 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -1,114 +1,177 @@
-plugin: manual
-id: monitor/vga
-requires: display.vga == 'supported'
-_description:
- PURPOSE:
-     This test will check your VGA port.
- STEPS:
-     Skip this test if your system does not have a VGA port.
-     1. Connect a display (if not already connected) to the VGA port on your system
- VERIFICATION:
-     Was the desktop displayed correctly on both screens?
+id: monitor/generator_vga
+_description: Job generator for VGA port test
+_summary: Job generator for VGA port test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_vga_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.vga == 'supported'
+ plugin: manual
+ _description:
+  PURPOSE:
+      This test will check your VGA port.
+  STEPS:
+      Skip this test if your system does not have a VGA port.
+      1. Connect a display (if not already connected) to the VGA port on your system
+  VERIFICATION:
+      Was the desktop displayed correctly on both screens?
+ EOF
 
-plugin: manual
-id: monitor/dvi
-requires: display.dvi == 'supported'
-_description:
- PURPOSE:
-     This test will check your DVI port.
- STEPS:
-     Skip this test if your system does not have a DVI port.
-     1. Connect a display (if not already connected) to the DVI port on your system
- VERIFICATION:
-     Was the desktop displayed correctly on both screens?
+id: monitor/generator_dvi
+_description: Job generator for DVI port test
+_summary: Job generator for DVI port test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_dvi_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.dvi == 'supported'
+ plugin: manual
+ _description:
+  PURPOSE:
+      This test will check your DVI port.
+  STEPS:
+      Skip this test if your system does not have a DVI port.
+      1. Connect a display (if not already connected) to the DVI port on your system
+  VERIFICATION:
+      Was the desktop displayed correctly on both screens?
+ EOF
 
-plugin: manual
-id: monitor/displayport
-requires: display.dp == 'supported'
-_description:
- PURPOSE:
-     This test will check your DisplayPort port.
- STEPS:
-     Skip this test if your system does not have a DisplayPort port.
-     1. Connect a display (if not already connected) to the DisplayPort port on your system
- VERIFICATION:
-     Was the desktop displayed correctly on both screens?
+id: monitor/generator_displayport
+_description: Job generator for Displayport test
+_summary: Job generator for Displayport test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_displayport_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.dp == 'supported'
+ plugin: manual
+ _description:
+  PURPOSE:
+      This test will check your DisplayPort port.
+  STEPS:
+      Skip this test if your system does not have a DisplayPort port.
+      1. Connect a display (if not already connected) to the DisplayPort port on your system
+  VERIFICATION:
+      Was the desktop displayed correctly on both screens?
+ EOF
 
-plugin: manual
-id: monitor/hdmi
-requires: display.hdmi == 'supported'
-_description:
- PURPOSE:
-     This test will check your HDMI port.
- STEPS:
-     Skip this test if your system does not have a HDMI port.
-     1. Connect a display (if not already connected) to the HDMI port on your system
- VERIFICATION:
-     Was the desktop displayed correctly on both screens?
+id: monitor/generator_hdmi
+_description: Job generator for HDMI port test
+_summary: Job generator for HDMI port test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_hdmi_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.hdmi == 'supported'
+ plugin: manual
+ _description:
+  PURPOSE:
+      This test will check your HDMI port.
+  STEPS:
+      Skip this test if your system does not have a HDMI port.
+      1. Connect a display (if not already connected) to the HDMI port on your system
+  VERIFICATION:
+      Was the desktop displayed correctly on both screens?
+ EOF
 
-plugin: manual
-id: monitor/svideo
-requires: display.svideo == 'supported'
-_description:
- PURPOSE:
-     This test will check your S-VIDEO port.
- STEPS:
-     Skip this test if your system does not have a S-VIDEO port.
-     1. Connect a display (if not already connected) to the S-VIDEO port on your system
- VERIFICATION:
-     Was the desktop displayed correctly on both screens?
+id: monitor/generator_svideo
+_description: Job generator for S-VIDEO port test
+_summary: Job generator for S-VIDEO port test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_svideo_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.svideo == 'supported'
+ plugin: manual
+ _description:
+  PURPOSE:
+      This test will check your S-VIDEO port.
+  STEPS:
+      Skip this test if your system does not have a S-VIDEO port.
+      1. Connect a display (if not already connected) to the S-VIDEO port on your system
+  VERIFICATION:
+      Was the desktop displayed correctly on both screens?
+ EOF
 
-plugin: manual
-id: monitor/rca
-requires: display.rca == 'supported'
-_description:
- PURPOSE:
-     This test will check your RCA port.
- STEPS:
-     Skip this test if your system does not have a RCA port.
-     1. Connect a display (if not already connected) to the RCA port on your system
- VERIFICATION:
-     Was the desktop displayed correctly on both screens?
+id: monitor/generator_rca
+_description: Job generator for RCA port test
+_summary: Job generator for RCA port test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_rca_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.rca == 'supported'
+ plugin: manual
+ _description:
+  PURPOSE:
+      This test will check your RCA port.
+  STEPS:
+      Skip this test if your system does not have a RCA port.
+      1. Connect a display (if not already connected) to the RCA port on your system
+  VERIFICATION:
+      Was the desktop displayed correctly on both screens?
+ EOF
 
-plugin: manual
-id: monitor/multi-head
-requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower']
-_description:
- PURPOSE:
-     This test verifies that multi-monitor output works on your desktop system. This is NOT the same test as the external monitor tests you would run on your laptop.  You will need two monitors to perform this test.
- STEPS:
-     Skip this test if your video card does not support multiple monitors.
-     1. If your second monitor is not already connected, connect it now
-     2. Open the "Displays" tool (open the dash and search for "Displays")
-     3. Configure your output to provide one desktop across both monitors
-     4. Open any application and drag it from one monitor to the next.
- VERIFICATION:
-     Was the stretched desktop displayed correctly across both screens?
+id: monitor/generator_multi-head
+_description: Job generator for multi-monitor test
+_summary: Job generator for multi-monitor test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_multi-head_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower']
+ plugin: manual
+ _description:
+  PURPOSE:
+      This test verifies that multi-monitor output works on your desktop system. This is NOT the same test as the external monitor tests you would run on your laptop.  You will need two monitors to perform this test.
+  STEPS:
+      Skip this test if your video card does not support multiple monitors.
+      1. If your second monitor is not already connected, connect it now
+      2. Open the "Displays" tool (open the dash and search for "Displays")
+      3. Configure your output to provide one desktop across both monitors
+      4. Open any application and drag it from one monitor to the next.
+  VERIFICATION:
+      Was the stretched desktop displayed correctly across both screens?
+ EOF
 
-plugin: user-interact-verify
-id: monitor/powersaving
-command: xset dpms force off
-_description:
- PURPOSE:
-     This test will check your monitor power saving capabilities
- STEPS:
-     1. Click "Test" to try the power saving capabilities of your monitor
-     2. Press any key or move the mouse to recover
- VERIFICATION:
-     Did the monitor go blank and turn on again?
+id: monitor/generator_powersaving
+_description: Job generator for monitor power-saving test
+_summary: Job generator for monitor power-saving test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_powersaving_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ plugin: user-interact-verify
+ command: xset dpms force off
+ _description:
+  PURPOSE:
+      This test will check your monitor power saving capabilities
+  STEPS:
+      1. Click "Test" to try the power saving capabilities of your monitor
+      2. Press any key or move the mouse to recover
+  VERIFICATION:
+      Did the monitor go blank and turn on again?
+ EOF
 
-plugin: user-interact-verify
-id: monitor/dim_brightness
-requires: dmi.product in ['Notebook','Laptop','Portable','All In One','All-In-One','AIO']
-user: root
-command: brightness_test
-_description:
- PURPOSE:
-     This test will test changes to screen brightness
- STEPS:
-     1. Click "Test" to try to dim the screen.
-     2. Check if the screen was dimmed approximately to half of the maximum brightness.
-     3. The screen will go back to the original brightness in 2 seconds.
- VERIFICATION:
-     Was your screen dimmed approximately to half of the maximum brightness?
+id: monitor/generator_dim_brightness
+_description: Job generator for screen dimming test
+_summary: Job generator for screen dimming test
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ id: monitor/`echo ${index}`_dim_brightness_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: dmi.product in ['Notebook','Laptop','Portable','All In One','All-In-One','AIO']
+ plugin: user-interact-verify
+ user: root
+ command: brightness_test
+ _description:
+  PURPOSE:
+      This test will test changes to screen brightness
+  STEPS:
+      1. Click "Test" to try to dim the screen.
+      2. Check if the screen was dimmed approximately to half of the maximum brightness.
+      3. The screen will go back to the original brightness in 2 seconds.
+  VERIFICATION:
+      Was your screen dimmed approximately to half of the maximum brightness?
+EOF
 
-- 
cgit v1.2.3


From b654d1d417b5390803769162994ca84dce0c8ad6 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Mon, 20 Apr 2015 16:37:57 +0800
Subject: Add requirement for monitor audio, change the job generator
 description

---
 jobs/audio.txt.in     | 14 ++++++++------
 jobs/graphics.txt.in  |  6 +++---
 jobs/hibernate.txt.in |  8 ++++----
 jobs/monitor.txt.in   | 36 ++++++++++++++++++------------------
 jobs/suspend.txt.in   | 19 +++++++++++--------
 5 files changed, 44 insertions(+), 39 deletions(-)

(limited to 'jobs')

diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index d8aeb51..4b22b64 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -40,12 +40,13 @@ requires:
  package.name == 'alsa-base'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  package.name == 'pulseaudio-utils'
-_description: Job generator for HDMI audio test
-_summary: Job generator for HDMI audio test
+_description: HDMI audio test
+_summary: HDMI audio test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  id: audio/`echo ${index}`_playback_hdmi_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.hdmi == 'supported'
  plugin: user-interact-verify
  estimated_duration: 30.0
  command:
@@ -71,12 +72,13 @@ requires:
  package.name == 'alsa-base'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  package.name == 'pulseaudio-utils'
-_description: Job generator for Displayport audio test
-_summary: Job generator for Displayport audio test
+_description: DisplayPort audio test
+_summary: DisplayPort audio test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  id: audio/`echo ${index}`_playback_displayport_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires: display.dp == 'supported'
  plugin: user-interact-verify
  estimated_duration: 30.0
  command:
@@ -104,8 +106,8 @@ requires:
  package.name == 'alsa-base'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  package.name == 'pulseaudio-utils'
-_description: Job generator for Thunderbolt audio test
-_summary: Job generator for Thunderbolt audio test
+_description: Thunderbolt audio test
+_summary: Thunderbolt audio test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 4eb0e47..fce7c1b 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -223,8 +223,8 @@ command:
 
 id: graphics/generator_display
 requires: device.category == 'VIDEO'
-_description: Job generator for display test
-_summary: Job generator for display test
+_description: Display test
+_summary: Display test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -234,7 +234,7 @@ command:
   package.name == 'xorg'
   package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  command: gst_pipeline_test -t 2 'videotestsrc ! videoconvert ! autovideosink' || gst_pipeline_test -t 2 'videotestsrc ! ffmpegcolorspace ! autovideosink'
- _summary: Test that video can be displayed
+ _summary: Test that video can be displayed with ${product}
  _description:
   PURPOSE:
       This test will test the default display
diff --git a/jobs/hibernate.txt.in b/jobs/hibernate.txt.in
index c0a15b3..a9ab661 100644
--- a/jobs/hibernate.txt.in
+++ b/jobs/hibernate.txt.in
@@ -2,8 +2,8 @@ id: power-management/generator_hibernate_advanced
 requires:
   sleep.disk == 'supported'
   rtc.state == 'supported'
-_description: Job generator for hibernate test
-_summary: Job generator for hibernate test
+_description: Hibernate test
+_summary: Hibernate test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -39,8 +39,8 @@ _description:
  Automated check of the hibernate log for errors discovered by fwts
 
 id: power-management/generator_hibernate-single-log-attach
-_description: Job generator for hibernate log attachment test
-_summary: Job generator for hibernate log attachment test
+_description: Hibernate log attach
+_summary: Hibernate log attach
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index 23a933c..aa56fa0 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -1,6 +1,6 @@
 id: monitor/generator_vga
-_description: Job generator for VGA port test
-_summary: Job generator for VGA port test
+_description: VGA port test
+_summary: VGA port test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -18,8 +18,8 @@ command:
  EOF
 
 id: monitor/generator_dvi
-_description: Job generator for DVI port test
-_summary: Job generator for DVI port test
+_description: DVI port test
+_summary: DVI port test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -37,8 +37,8 @@ command:
  EOF
 
 id: monitor/generator_displayport
-_description: Job generator for Displayport test
-_summary: Job generator for Displayport test
+_description: DisplayPort test
+_summary: DisplayPort test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -56,8 +56,8 @@ command:
  EOF
 
 id: monitor/generator_hdmi
-_description: Job generator for HDMI port test
-_summary: Job generator for HDMI port test
+_description: HDMI port test
+_summary: HDMI port test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -75,8 +75,8 @@ command:
  EOF
 
 id: monitor/generator_svideo
-_description: Job generator for S-VIDEO port test
-_summary: Job generator for S-VIDEO port test
+_description: S-VIDEO port test
+_summary: S-VIDEO port test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -94,8 +94,8 @@ command:
  EOF
 
 id: monitor/generator_rca
-_description: Job generator for RCA port test
-_summary: Job generator for RCA port test
+_description: RCA port test
+_summary: RCA port test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -113,8 +113,8 @@ command:
  EOF
 
 id: monitor/generator_multi-head
-_description: Job generator for multi-monitor test
-_summary: Job generator for multi-monitor test
+_description: Multi-monitor test
+_summary: Multi-monitor test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -135,8 +135,8 @@ command:
  EOF
 
 id: monitor/generator_powersaving
-_description: Job generator for monitor power-saving test
-_summary: Job generator for monitor power-saving test
+_description: Monitor power-saving test
+_summary: Monitor power-saving test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -154,8 +154,8 @@ command:
  EOF
 
 id: monitor/generator_dim_brightness
-_description: Job generator for screen dimming test
-_summary: Job generator for screen dimming test
+_description: Screen dimming test
+_summary: Screen dimming test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 378af52..3e89bea 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -285,6 +285,9 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: user-interact-verify
  id: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires:
+  sleep.mem == 'supported'
+  rtc.state == 'supported'
  depends: graphics/`echo ${index}`_switch_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  user: root
  environ: PLAINBOX_SESSION_SHARE
@@ -325,8 +328,8 @@ command: set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_s
 estimated_duration: 90.000
 
 id: suspend/generator_hybrid_sleep
-_description: Job generator for hybrid sleep test
-_summary: Job generator for hybrid sleep test
+_description: Hybrid sleep test
+_summary: Hybrid sleep test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -356,8 +359,8 @@ _description:
  Automated check of the suspend log to look for errors reported by fwts
 
 id: suspend/generator_suspend-single-log-attach
-_description: Job generator for suspend log attach
-_summary: Job generator for suspend log attach
+_description: Suspend log attach
+_summary: Suspend log attach
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -376,8 +379,8 @@ _description:
  Automated check of the hybrid sleep log to look for errors reported by fwts
 
 id: suspend/generator_hybrid-sleep-single-log-attach
-_description: Job generator for hybrid sleep log attach
-_summary: Job generator for hybrid sleep log attach
+_description: Hybrid sleep log attach
+_summary: Hybrid sleep log attach
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
@@ -389,8 +392,8 @@ command:
  EOF
 
 id: suspend/generator_suspend-time-check
-_description: Job generator for suspend time check test
-_summary: Job generator for suspend time check test
+_description: Suspend time check test
+_summary: Suspend time check test
 plugin: local
 command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
-- 
cgit v1.2.3


From 6450577137edba3504cdd7c4f8dcd84d35cbe3a1 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Wed, 22 Apr 2015 11:12:39 +0800
Subject: minor fixes for suspend job command

---
 jobs/led.txt.in     | 1 +
 jobs/suspend.txt.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'jobs')

diff --git a/jobs/led.txt.in b/jobs/led.txt.in
index fe42296..c863271 100644
--- a/jobs/led.txt.in
+++ b/jobs/led.txt.in
@@ -24,6 +24,7 @@ _description:
 plugin: manual
 id: led/suspend
 estimated_duration: 30.0
+depends: suspend/suspend_advanced
 _description:
  PURPOSE:
      Suspend LED verification.
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 3e89bea..472dca7 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -294,7 +294,7 @@ command:
  command:
   if type -P fwts >/dev/null; then
    echo "Calling fwts"
-   set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/`echo ${index}`suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single_times.log
+   set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single_times.log
   else
    echo "Calling sleep_test"
    set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single_times.log
-- 
cgit v1.2.3


From 39395f88c23c74b88d87ca4e8e975242447258a1 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Wed, 22 Apr 2015 17:00:56 +0800
Subject: Add dependency to hybrid graphic test

---
 jobs/suspend.txt.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jobs')

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 472dca7..307cc40 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -386,6 +386,7 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: attachment
  id: suspend/`echo ${index}`_hybrid-sleep-single-log-attach_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_hybrid_sleep_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single.log ] && cat $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single.log
  _description:
   Attaches the log from the single hybrid sleep/resume test to the results
-- 
cgit v1.2.3


From 31003ce7b590111f41b17b3e82889226605a7388 Mon Sep 17 00:00:00 2001
From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Wed, 22 Apr 2015 19:04:05 +0800
Subject: Make it not always using the local job generated test case

---
 jobs/hibernate.txt.in | 34 ++++++++++++++++++++++++++++++++++
 jobs/stress.txt.in    |  2 +-
 jobs/suspend.txt.in   | 29 ++++++++++++++++++++++++++---
 3 files changed, 61 insertions(+), 4 deletions(-)

(limited to 'jobs')

diff --git a/jobs/hibernate.txt.in b/jobs/hibernate.txt.in
index a9ab661..7fde5ef 100644
--- a/jobs/hibernate.txt.in
+++ b/jobs/hibernate.txt.in
@@ -1,3 +1,30 @@
+plugin: user-interact-verify
+id: power-management/hibernate_advanced
+requires:
+  sleep.disk == 'supported'
+  rtc.state == 'supported'
+environ: PLAINBOX_SESSION_SHARE
+user: root
+command:
+ if type -P fwts >/dev/null; then
+  echo "Calling fwts"
+  fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
+ else
+  echo "Calling sleep_test"
+  sleep_test -s disk -w 120
+ fi
+estimated_duration: 300.00
+_description:
+ PURPOSE:
+     This test will check to make sure your system can successfully hibernate (if supported)
+ STEPS:
+     1. Click on Test
+     2. The system will hibernate and should wake itself within 5 minutes
+     3. If your system does not wake itself after 5 minutes, please press the power button to wake the system manually
+     4. If the system fails to resume from hibernate, please restart System Testing and mark this test as Failed
+ VERIFICATION:
+     Did the system successfully hibernate and did it work properly after waking up?
+
 id: power-management/generator_hibernate_advanced
 requires:
   sleep.disk == 'supported'
@@ -38,6 +65,13 @@ command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && sleep_test_log_c
 _description:
  Automated check of the hibernate log for errors discovered by fwts
 
+plugin: attachment
+id: power-management/hibernate-single-log-attach
+depends: power-management/hibernate_advanced
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate-single.log
+estimated_duration: 0.5
+_description: attaches log from single hibernate/resume test to results
+
 id: power-management/generator_hibernate-single-log-attach
 _description: Hibernate log attach
 _summary: Hibernate log attach
diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in
index 565a91a..bc64dd2 100644
--- a/jobs/stress.txt.in
+++ b/jobs/stress.txt.in
@@ -13,7 +13,7 @@ plugin: shell
 id: power-management/hibernate_30_cycles
 estimated_duration: 5400.00
 depends:
- power-management/1_hibernate_advanced_.*
+ power-management/hibernate_advanced
 requires:
  sleep.disk == 'supported'
  rtc.state == 'supported'
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 307cc40..ec46267 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -258,7 +258,7 @@ environ: PLAINBOX_SESSION_SHARE
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/2_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/2_suspend_single_times.log
+  set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/1_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/1_suspend_single_times.log
  else
   echo "Calling sleep_test"
   set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/2_suspend_single_times.log
@@ -358,6 +358,13 @@ command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && sleep_test_log_che
 _description:
  Automated check of the suspend log to look for errors reported by fwts
 
+plugin: attachment
+id: suspend/suspend-single-log-attach
+depends: suspend/suspend_advanced
+command: [ -e $PLAINBOX_SESSION_SHARE/1_suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/1_suspend_single.log
+_description:
+ Attaches the log from the single suspend/resume test to the results
+
 id: suspend/generator_suspend-single-log-attach
 _description: Suspend log attach
 _summary: Suspend log attach
@@ -366,6 +373,7 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: attachment
  id: suspend/`echo ${index}`_suspend-single-log-attach_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single.log
  _description:
   Attaches the log from the single suspend/resume test to the results
@@ -392,6 +400,13 @@ command:
   Attaches the log from the single hybrid sleep/resume test to the results
  EOF
 
+plugin: shell
+id: suspend/suspend-time-check
+estimated_duration: 1.2
+command: [ -e $PLAINBOX_SESSION_SHARE/1_suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/1_suspend_single_times.log
+_description:
+ Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
+
 id: suspend/generator_suspend-time-check
 _description: Suspend time check test
 _summary: Suspend time check test
@@ -400,6 +415,7 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: shell
  id: suspend/`echo ${index}`_suspend-time-check_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  estimated_duration: 1.2
  command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single_times.log
  _description: Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
@@ -460,7 +476,7 @@ command:
  plugin: shell
  id: suspend/`echo ${index}`_resolution_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  estimated_duration: 1.2
- depends: suspend/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'` suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  _description: Test to see that we have the same resolution after resuming as before.
  command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.txt -
  EOF
@@ -540,7 +556,7 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: manual
  id: suspend/`echo ${index}`_display_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
- depends: suspend/suspend_advanced
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  _summary: Test display function after suspend for $product
  _description:
   PURPOSE:
@@ -1371,6 +1387,7 @@ command:
  cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
  plugin: user-interact-verify
  id: suspend/`echo ${index}`_cycle_resolutions_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
  estimated_duration: 120.0
  requires: package.name == 'xorg'
  depends: suspend/suspend_advanced
@@ -1394,6 +1411,12 @@ _description:
  This is done automatically by taking screenshots and uploading them as an attachment.
 command: xrandr_cycle --keyword=after_suspend --screenshot-dir $PLAINBOX_SESSION_SHARE
 
+plugin: attachment
+id: suspend/xrandr_screens_after_suspend.tar_gz
+depends: suspend/cycle_resolutions_after_suspend
+command: [ -e $PLAINBOX_SESSION_SHARE/1_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/1_xrandr_screens_after_suspend.tgz
+_description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
+
 plugin: local
 id: suspend/generator_xrandr_screens_after_suspend.tar_gz
 _description: Attach screenshots from the suspend/cycle_resolution_after_suspend test to the results submission.
-- 
cgit v1.2.3