" providers:checkbox: Added estimated_duration to some tests.

 I also took the opportunity to fix a few minor errors in test definitions. Mainly trailing whitespace but also a couple of mistakes in the tests themselves. Tests fixed: - A couple of user-verify changed to user-verify-interact - A test for 100 network restarts was doing only 1 iteration. - A log attachment test depended on its log producer passing, but if the log producer fails, the attacher won't attach the log file (thus no way to debug the problem). [r=zkrynicki][bug=1348289][author=roadmr]"

11 files changed, 141 insertions, 11 deletions

diff --git a/jobs/benchmarks.txt.in b/jobs/benchmarks.txt.in
index 8f03ff3..3550261 100644
--- a/jobs/benchmarks.txt.in
+++ b/jobs/benchmarks.txt.in
@@ -2,11 +2,13 @@ plugin: local
 _summary: Benchmark for each disk
 id: benchmarks/disk/hdparm-read
 requires: device.category == 'DISK'
+estimated_duration: 1.0
 _description: Benchmark for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
 id: benchmarks/disk/hdparm-read_`ls /sys$path/block`
+ estimated_duration: 15.0
 requires: device.path == "$path"
 user: root
 command: hdparm -t /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
@@ -16,12 +18,14 @@ command:
 plugin: local
 _summary: Benchmark for each disk
 id: benchmarks/disk/hdparm-cache-read
+estimated_duration: 1.0
 requires: device.category == 'DISK'
 _description: Benchmark for each disk
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
 id: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block`
+ estimated_duration: 10.0
 requires: device.path == "$path"
 user: root
 command: hdparm -T /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//'
@@ -126,42 +130,49 @@ _description: Run Lightsmark benchmark
 
 plugin: shell
 id: benchmarks/memory/cachebench-read
+estimated_duration: 160.0
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=0" pts_run cachebench
 _description: Run Cachebench Read benchmark
 
 plugin: shell
 id: benchmarks/memory/cachebench-write
+estimated_duration: 130.0
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=1" pts_run cachebench
 _description: Run Cachebench Write benchmark
 
 plugin: shell
 id: benchmarks/memory/cachebench-read-modify-write
+estimated_duration: 140.0
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="cachebench.test=2" pts_run cachebench
 _description: Run Cachebench Read / Modify / Write benchmark
 
 plugin: shell
 id: benchmarks/memory/stream-copy
+estimated_duration: 6.0
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=0" pts_run stream
 _description: Run Stream Copy benchmark
 
 plugin: shell
 id: benchmarks/memory/stream-scale
+estimated_duration: 6.0
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=1" pts_run stream
 _description: Run Stream Scale benchmark
 
 plugin: shell
 id: benchmarks/memory/stream-add
+estimated_duration: 5.0
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=2" pts_run stream
 _description: Run Stream Add benchmark
 
 plugin: shell
 id: benchmarks/memory/stream-triad
+estimated_duration: 4.0
 requires: package.name == 'phoronix-test-suite'
 command: PRESET_OPTIONS="stream.run-type=3" pts_run stream
 _description: Run Stream Triad benchmark
@@ -181,12 +192,14 @@ _description: Check the time needed to reconnect to a WIFI access point
 
 plugin: shell
 id: benchmarks/processor/encode-mp3
+estimated_duration: 140.0
 requires: package.name == 'phoronix-test-suite'
 command: pts_run encode-mp3
 _description: Run Encode MP3 benchmark
 
 plugin: shell
 id: benchmarks/processor/x264
+estimated_duration: 400.0
 requires: package.name == 'phoronix-test-suite'
 command: pts_run x264
 _description: Run x264 H.264/AVC encoder benchmark
@@ -199,36 +212,42 @@ _description: Run GnuPG benchmark
 
 plugin: shell
 id: benchmarks/processor/compress-pbzip2
+estimated_duration: 90.0
 requires: package.name == 'phoronix-test-suite'
 command: pts_run compress-pbzip2
 _description: Run Compress PBZIP2 benchmark
 
 plugin: shell
 id: benchmarks/processor/compress-7zip
+estimated_duration: 1400
 requires: package.name == 'phoronix-test-suite'
 command: pts_run compress-7zip
 _description: Run Compress 7ZIP benchmark
 
 plugin: shell
 id: benchmarks/processor/n-queens
+estimated_duration: 330.0
 requires: package.name == 'phoronix-test-suite'
 command: pts_run n-queens
 _description: Run N-Queens benchmark
 
 plugin: shell
 id: benchmarks/processor/himeno
+estimated_duration: 75.0
 requires: package.name == 'phoronix-test-suite'
 command: pts_run himeno
 _description: Run Himeno benchmark
 
 plugin: shell
 id: benchmarks/system/cpu_on_idle
+estimated_duration: 10.0
 requires: package.name == 'sysstat'
 command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("idle\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
 _description: CPU utilization on an idle system.
 
 plugin: shell
 id: benchmarks/system/disk_on_idle
+estimated_duration: 10.0
 requires: package.name == 'sysstat'
 command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("util\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
 _description: Disk utilization on an idle system.
diff --git a/jobs/cpu.txt.in b/jobs/cpu.txt.in
index caf42a0..3b8db4d 100644
--- a/jobs/cpu.txt.in
+++ b/jobs/cpu.txt.in
@@ -1,5 +1,6 @@
 plugin: shell
 id: cpu/scaling_test
+estimated_duration: 150.0
 requires:
 package.name == 'fwts'
 user: root
@@ -10,6 +11,7 @@ _description:
 
 plugin: attachment
 id: cpu/scaling_test-log-attach
+estimated_duration: 1.0
 depends: cpu/scaling_test
 command: [[ -e ${PLAINBOX_SESSION_SHARE}/scaling_test.log ]] && cat ${PLAINBOX_SESSION_SHARE}/scaling_test.log
 _description:
@@ -17,6 +19,7 @@ _description:
 
 plugin: shell
 id: cpu/maxfreq_test
+estimated_duration: 0.6
 requires:
 package.name == 'fwts'
 user: root
@@ -26,6 +29,7 @@ _description:
 
 plugin: attachment
 id: cpu/maxfreq_test-log-attach
+estimated_duration: 1.0
 depends: cpu/maxfreq_test
 command: [ -e $PLAINBOX_SESSION_SHARE/maxfreq_test.log ] && cat $PLAINBOX_SESSION_SHARE/maxfreq_test.log
 _description:
@@ -33,12 +37,14 @@ _description:
 
 plugin: shell
 id: cpu/clocktest
+estimated_duration: 60.0
 command: clocktest
 _description:
 Test for clock jitter.
 
 plugin: shell
 id: cpu/offlining_test
+estimated_duration: 1.0
 user: root
 command: cpu_offlining
 _description:
@@ -46,6 +52,7 @@ _description:
 
 plugin: shell
 id: cpu/topology
+estimated_duration: 1.0
 requires: int(cpuinfo.count) > 1 and (cpuinfo.platform == 'i386' or cpuinfo.platform == 'x86_64')
 command: cpu_topology
 _description:
@@ -53,6 +60,7 @@ _description:
 
 plugin: shell
 id: cpu/frequency_governors
+estimated_duration: 22.0
 user: root
 command: nice -n -20 frequency_governors_test --debug
 _description:
@@ -60,6 +68,7 @@ _description:
 
 plugin: shell
 id: cpu/arm_vfp_support
+estimated_duration: 1.0
 requires: 'arm' in cpuinfo.type
 command: grep VFP /var/log/syslog
 _description:
diff --git a/jobs/disk.txt.in b/jobs/disk.txt.in
index 5d70021..19dd840 100644
--- a/jobs/disk.txt.in
+++ b/jobs/disk.txt.in
@@ -1,5 +1,6 @@
 plugin: shell
 id: disk/detect
+estimated_duration: 0.25
 command: udev_resource | filter_templates -w "category=DISK" | awk -F': ' '$1 == "product" { print $2 }'
 _description: Detects and displays disks attached to the system.
 
@@ -12,7 +13,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
 id: disk/stats_`ls /sys$path/block`
- requires: 
+ requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
 user: root
@@ -23,6 +24,7 @@ command:
 plugin: local
 _summary: SMART test
 id: disk/smart
+estimated_duration: 0.30
 requires:
 package.name == 'smartmontools'
 device.category == 'DISK'
@@ -31,7 +33,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
 id: disk/smart_`ls /sys$path/block`
- requires: 
+ requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
 description:
@@ -43,6 +45,7 @@ command:
 plugin: local
 _summary: Verify system storage performs at or above baseline performance
 id: disk/read_performance
+estimated_duration: 0.30
 requires:
 device.category == 'DISK'
 _description: Verify system storage performs at or above baseline performance
@@ -50,6 +53,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
 id: disk/read_performance_`ls /sys$path/block`
+ estimated_duration: 65.0
 requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -61,6 +65,7 @@ command:
 plugin: local
 _summary: Verify that storage devices, such as Fibre Channel and RAID can be detected and perform under stress.
 id: disk/storage_devices
+estimated_duration: 1.0
 requires:
 device.category == 'DISK'
 _description: Verify that storage devices, such as Fibre Channel and RAID can be detected and perform under stress.
@@ -68,6 +73,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: shell
 id: disk/storage_device_`ls /sys$path/block`
+ estimated_duration: 375.0
 user: root
 requires:
 device.path == "$path"
@@ -78,7 +84,8 @@ command:
 
 plugin: shell
 id: disk/spindown
-requires: 
+estimated_duration: 875.0
+requires:
 device.category == 'DISK'
 package.name == 'smartmontools'
 user: root
@@ -88,6 +95,7 @@ _description:
 
 plugin: user-interact
 id: disk/hdd-parking
+estimated_duration: 60.0
 requires: device.category == 'DISK'
 depends: input/accelerometer
 user: root
diff --git a/jobs/info.txt.in b/jobs/info.txt.in
index 67e5af5..37eaa27 100644
--- a/jobs/info.txt.in
+++ b/jobs/info.txt.in
@@ -142,6 +142,7 @@ command:
 plugin: local
 _summary: SATA/IDE device information.
 id: info/hdparm
+estimated_duration: 1.0
 _description: SATA/IDE device information.
 requires:
 package.name == 'hdparm'
@@ -150,6 +151,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
 plugin: attachment
 id: info/hdparm_`ls /sys$path/block`.txt
+ estimated_duration: 1.0
 requires:
 device.path == "$path"
 block_device.`ls /sys$path/block`_state != 'removable'
@@ -228,6 +230,7 @@ _description: Provides information about displays attached to the system
 
 plugin: attachment
 id: info/disk_partitions
+estimated_duration: 1.0
 user: root
 command: parted -l -s
 _description: Attaches information about disk partitions
diff --git a/jobs/input.txt.in b/jobs/input.txt.in
index 4544b0a..f66c89c 100644
--- a/jobs/input.txt.in
+++ b/jobs/input.txt.in
@@ -1,6 +1,7 @@
 plugin: local
 _summary: Pointing device tests.
 id: input/pointing
+estimated_duration: 30.0
 requires:
 device.category == 'MOUSE' or device.category == 'TOUCHPAD' or device.category == 'TOUCHSCREEN'
 _description: Pointing device tests.
@@ -20,6 +21,7 @@ command:
 
 plugin: manual
 id: input/mouse
+estimated_duration: 30.0
 _description:
 PURPOSE:
 This test will test your pointing device
@@ -31,6 +33,7 @@ _description:
 
 plugin: user-interact-verify
 id: input/keyboard
+estimated_duration: 30.0
 command: keyboard_test
 requires: device.category == 'KEYBOARD'
 _description:
@@ -44,6 +47,7 @@ _description:
 
 plugin: manual
 id: input/accelerometer_verify
+estimated_duration: 30.0
 _description:
 PURPOSE:
 Manual detection of accelerometer.
@@ -54,6 +58,7 @@ _description:
 
 plugin: user-interact
 id: input/accelerometer
+estimated_duration: 60.0
 user: root
 depends: input/accelerometer_verify
 command: accelerometer_test -m
@@ -69,6 +74,7 @@ _description:
 
 plugin: local
 id: input/clicking
+estimated_duration: 1.0
 requires:
 device.category == 'MOUSE' or device.category == 'TOUCHPAD'
 _summary: Create click tests for pointing devices.
@@ -76,6 +82,7 @@ _description: Click tests for pointing devices.
 command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=MOUSE" -w "category=TOUCHPAD"'
 plugin: manual
+ estimated_duration: 30.0
 id: input/clicking_`echo "${product}_${category}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`_`basename $path`
 requires: device.path == "$path"
 _summary: Check button functionality for $product
diff --git a/jobs/keys.txt.in b/jobs/keys.txt.in
index 2db8429..4430c38 100644
--- a/jobs/keys.txt.in
+++ b/jobs/keys.txt.in
@@ -1,5 +1,6 @@
 plugin: user-interact
 id: keys/lock-screen
+estimated_duration: 30.0
 requires:
 device.category == 'KEYBOARD'
 command: lock_screen_watcher
@@ -17,6 +18,7 @@ _description:
 
 plugin: manual
 id: keys/brightness
+estimated_duration: 30.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -28,6 +30,7 @@ _description:
 
 plugin: user-interact-verify
 id: keys/volume
+estimated_duration: 30.0
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -44,6 +47,7 @@ _description:
 
 plugin: user-interact-verify
 id: keys/mute
+estimated_duration: 30.0
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -59,6 +63,7 @@ _description:
 
 plugin: manual
 id: keys/sleep
+estimated_duration: 90.0
 requires:
 device.category == 'KEYBOARD'
 _description:
@@ -72,6 +77,7 @@ _description:
 
 plugin: user-interact-verify
 id: keys/battery-info
+estimated_duration: 30.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 user: root
 command: key_test -s '0xe071,0xef1:Battery Info'
@@ -88,6 +94,7 @@ _description:
 
 plugin: manual
 id: keys/wireless
+estimated_duration: 90.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -106,6 +113,7 @@ _description:
 
 plugin: user-interact
 id: keys/media-control
+estimated_duration: 30.0
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -122,6 +130,7 @@ _description:
 
 plugin: user-interact
 id: keys/super
+estimated_duration: 30.0
 requires:
 device.category == 'KEYBOARD'
 user: root
@@ -137,6 +146,7 @@ _description:
 
 plugin: manual
 id: keys/video-out
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -149,6 +159,7 @@ _description:
 
 plugin: manual
 id: keys/touchpad
+estimated_duration: 30.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -162,6 +173,7 @@ _description:
 
 plugin: manual
 id: keys/keyboard-backlight
+estimated_duration: 30.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -176,6 +188,7 @@ _description:
 
 plugin: user-interact-verify
 id: keys/microphone-mute
+estimated_duration: 60.0
 requires:
 device.category == 'AUDIO'
 device.category == 'KEYBOARD'
@@ -195,6 +208,7 @@ _description:
 
 plugin: manual
 id: keys/hibernate
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -208,6 +222,7 @@ _description:
 
 plugin: manual
 id: keys/keyboard-overhead-light
+estimated_duration: 30.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
diff --git a/jobs/led.txt.in b/jobs/led.txt.in
index adb763e..fe42296 100644
--- a/jobs/led.txt.in
+++ b/jobs/led.txt.in
@@ -1,5 +1,6 @@
 plugin: manual
 id: led/power
+estimated_duration: 15.0
 _description:
 PURPOSE:
 Power LED verification
@@ -10,6 +11,7 @@ _description:
 
 plugin: manual
 id: led/power-blink-suspend
+estimated_duration: 30.0
 depends: suspend/suspend_advanced
 _description:
 PURPOSE:
@@ -21,6 +23,7 @@ _description:
 
 plugin: manual
 id: led/suspend
+estimated_duration: 30.0
 _description:
 PURPOSE:
 Suspend LED verification.
@@ -33,6 +36,7 @@ _description:
 
 plugin: manual
 id: led/battery-charging
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Validate that the battery light shows charging status
@@ -44,6 +48,7 @@ _description:
 
 plugin: manual
 id: led/battery-charged
+estimated_duration: 240.0
 _description:
 PURPOSE:
 Validate that the battery LED properly displays charged status
@@ -56,6 +61,7 @@ _description:
 
 plugin: manual
 id: led/battery-low
+estimated_duration: 30.0
 _description:
 PURPOSE:
 Validate that the battery LED indicated low power
@@ -67,6 +73,7 @@ _description:
 
 plugin: user-interact-verify
 id: led/hdd
+estimated_duration: 30.0
 command: led_hdd_test
 _description:
 PURPOSE:
@@ -79,6 +86,7 @@ _description:
 
 plugin: user-interact-verify
 id: led/numeric-keypad
+estimated_duration: 30.0
 command: keyboard_test
 _description:
 PURPOSE:
@@ -93,6 +101,7 @@ _description:
 
 plugin: manual
 id: led/caps-lock
+estimated_duration: 30.0
 _description:
 PURPOSE:
 Block cap keys LED verification
@@ -105,6 +114,7 @@ _description:
 plugin: manual
 id: led/wlan
 depends: keys/wireless
+estimated_duration: 60.0
 _description:
 PURPOSE:
 WLAN LED verification
@@ -117,6 +127,7 @@ _description:
 
 plugin: manual
 id: led/wlan-disabled
+estimated_duration: 30.0
 depends: keys/wireless
 _description:
 PURPOSE:
@@ -130,6 +141,7 @@ _description:
 
 plugin: manual
 id: led/bluetooth
+estimated_duration: 60.0
 depends: bluetooth/detect-output
 _description:
 PURPOSE:
@@ -144,6 +156,7 @@ _description:
 
 plugin: user-interact-verify
 id: led/camera
+estimated_duration: 30.0
 depends: camera/detect
 command: camera_test led
 _description:
@@ -157,6 +170,7 @@ _description:
 
 plugin: manual
 id: led/touchpad
+estimated_duration: 30.0
 _description:
 PURPOSE:
 Touchpad LED verification
@@ -170,6 +184,7 @@ _description:
 
 plugin: manual
 id: led/wireless
+estimated_duration: 120.0
 _description:
 PURPOSE:
 Wireless (WLAN + Bluetooth) LED verification
@@ -186,6 +201,7 @@ _description:
 plugin: manual
 id: led/mute
 depends: keys/mute
+estimated_duration: 30.0
 _description:
 PURPOSE:
 Audio Mute LED verification.
@@ -198,6 +214,7 @@ _description:
 
 plugin: manual
 id: led/microphone-mute
+estimated_duration: 30.0
 depends: keys/microphone-mute
 _description:
 PURPOSE:
diff --git a/jobs/memory.txt.in b/jobs/memory.txt.in
index cacb2a2..136d984 100644
--- a/jobs/memory.txt.in
+++ b/jobs/memory.txt.in
@@ -1,5 +1,6 @@
 plugin: shell
 id: memory/info
+estimated_duration: 5.0 
 user: root
 command: memory_compare
 _description:
@@ -8,6 +9,7 @@ _description:
 
 plugin: shell
 id: memory/check
+estimated_duration: 1000.0
 user: root
 requires:
 uname.name == 'Linux'
diff --git a/jobs/optical.txt.in b/jobs/optical.txt.in
index 12e00c3..b7be742 100644
--- a/jobs/optical.txt.in
+++ b/jobs/optical.txt.in
@@ -11,6 +11,7 @@ command:
 plugin: local
 _summary: Optical read test.
 id: optical/read
+estimated_duration: 1.0
 requires:
 device.category == 'CDROM'
 _description: Optical read test.
@@ -36,6 +37,7 @@ command:
 plugin: local
 _summary: Automated optical read test.
 id: optical/read-automated
+estimated_duration: 1.0
 requires:
 device.category == 'CDROM'
 _description: Automated optical read test.
@@ -54,6 +56,7 @@ command:
 plugin: local
 _summary: CD write test.
 id: optical/cdrom-write
+estimated_duration: 1.0
 requires:
 device.category == 'CDROM'
 _description: CD write test.
@@ -62,7 +65,7 @@ command:
 plugin: user-interact-verify
 id: optical/cdrom-write_`ls /sys$path/block`
 estimated_duration: 120.0
- requires: 
+ requires:
 device.path == "$path"
 optical_drive_`ls /sys$path/block`.cd_write == 'supported'
 user: root
@@ -82,6 +85,7 @@ command:
 plugin: local
 _summary: Automated CD write test
 id: optical/cdrom-write-automated
+estimated_duration: 1.0
 requires:
 device.category == 'CDROM'
 _description: Automated CD write test
@@ -90,7 +94,7 @@ command:
 plugin: shell
 id: optical/cdrom-write-automated_`ls /sys$path/block`
 estimated_duration: 120.0
- requires: 
+ requires:
 device.path == "$path"
 optical_drive_`ls /sys$path/block`.cd_write == 'supported'
 user: root
@@ -122,6 +126,7 @@ _description:
 plugin: local
 _summary: DVD write test.
 id: optical/dvd-write
+estimated_duration: 1.0
 requires:
 device.category == 'CDROM'
 _description: DVD write test.
@@ -129,7 +134,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
 plugin: user-interact-verify
 id: optical/dvd-write_`ls /sys$path/block`
- requires: 
+ requires:
 device.path == "$path"
 optical_drive_`ls /sys$path/block`.dvd_write == 'supported'
 estimated_duration: 120.0
@@ -150,6 +155,7 @@ command:
 plugin: local
 _summary: Automated DVD write test.
 id: optical/dvd-write-automated
+estimated_duration: 1.0
 requires:
 device.category == 'CDROM'
 _description: Automated DVD write test.
@@ -158,7 +164,7 @@ command:
 plugin: shell
 id: optical/dvd-write-automated_`ls /sys$path/block`
 estimated_duration: 120.0
- requires: 
+ requires:
 device.path == "$path"
 optical_drive_`ls /sys$path/block`.dvd_write == 'supported'
 user: root
@@ -186,6 +192,7 @@ _description:
 plugin: local
 _summary: Automated Blu-Ray read test.
 id: optical/bluray-read
+estimated_duration: 1.0
 requires: device.category == 'CDROM'
 _description: Automated Blu-Ray read test.
 command:
@@ -212,6 +219,7 @@ command:
 plugin: local
 _summary: Automated Blu-Ray write test.
 id: optical/bluray-write
+estimated_duration: 1.0
 requires: device.category == 'CDROM'
 _description: Automated Blu-Ray write test.
 command:
diff --git a/jobs/power-management.txt.in b/jobs/power-management.txt.in
index 51524fa..51734ff 100644
--- a/jobs/power-management.txt.in
+++ b/jobs/power-management.txt.in
@@ -1,5 +1,6 @@
 plugin: manual
 id: power-management/shutdown-boot
+estimated_duration: 300.0
 _description:
 PURPOSE:
 This test will check your system shutdown/booting cycle.
@@ -31,6 +32,7 @@ command: [ -e ${PLAINBOX_SESSION_SHARE}/fwts-wakealarm.log ] && cat ${PLAINBOX_S
 
 plugin: user-interact-verify
 id: power-management/poweroff
+estimated_duration: 120.0
 depends: power-management/fwts_wakealarm
 user: root
 environ: PLAINBOX_SESSION_SHARE
@@ -53,12 +55,14 @@ _description:
 
 plugin: attachment
 id: power-management/poweroff-log-attach
+estimated_duration: 1.0
 command: tar cvfz ${PLAINBOX_SESSION_SHARE}/power-management_poweroff.tgz ${PLAINBOX_SESSION_SHARE}/*poweroff.1.log && cat ${PLAINBOX_SESSION_SHARE}/power-management_poweroff.tgz
 _description:
 This will attach any logs from the power-management/poweroff test to the results.
 
 plugin: user-interact-verify
 id: power-management/reboot
+estimated_duration: 120.0
 user: root
 environ: PLAINBOX_SESSION_SHARE
 requires:
@@ -78,12 +82,14 @@ _description:
 
 plugin: attachment
 id: power-management/reboot-log-attach
+estimated_duration: 1.0
 command: tar cvfz ${PLAINBOX_SESSION_SHARE}/power-management_reboot.tgz ${PLAINBOX_SESSION_SHARE}/*reboot.1.log && cat ${PLAINBOX_SESSION_SHARE}/power-management_reboot.tgz
 _description:
 This will attach any logs from the power-management/reboot test to the results.
 
 plugin: manual
 id: power-management/lid
+estimated_duration: 120.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE:
@@ -93,8 +99,9 @@ _description:
 VERIFICATION:
 Does closing your laptop lid cause your system to suspend?
 
-plugin: user-interact
+plugin: user-interact-verify
 id: power-management/lid_close
+estimated_duration: 60.0
 requires: device.product == 'Lid Switch'
 command:
 for i in `seq 20`; do
@@ -111,8 +118,9 @@ _description:
 VERIFICATION:
 Did the screen turn off while the lid was closed?
 
-plugin: user-interact
+plugin: user-interact-verify
 id: power-management/lid_open
+estimated_duration: 60.0
 requires: device.product == 'Lid Switch'
 command:
 for i in `seq 20`; do
@@ -145,6 +153,7 @@ _description:
 
 plugin: shell
 id: power-management/tickless_idle
+estimated_duration: 1.0
 requires: cpuinfo.platform in ('i386', 'x86_64', 'ppc64el', 'pSeries')
 _description: Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple regression check)
 command:
@@ -152,6 +161,7 @@ command:
 
 plugin: manual
 id: power-management/unplug_ac
+estimated_duration: 30.0
 _description:
 PURPOSE:
 This test will ensure that the AC is unplugged for the battery drain tests to run.
@@ -162,6 +172,7 @@ _description:
 
 plugin: shell
 id: power-management/battery_drain_idle
+estimated_duration: 90.0
 requires: package.name == 'upower'
 depends: power-management/unplug_ac
 _description: Checks the battery drain during idle. Reports time until empty
@@ -171,6 +182,7 @@ command:
 
 plugin: shell
 id: power-management/battery_drain_movie
+estimated_duration: 90.0
 requires:
 package.name == 'upower'
 depends: power-management/unplug_ac
@@ -181,6 +193,7 @@ command:
 
 plugin: shell
 id: power-management/battery_drain_sleep
+estimated_duration: 140.0
 user: root
 requires:
 package.name == 'upower'
@@ -193,6 +206,7 @@ command:
 
 plugin: manual
 id: power-management/plug_ac
+estimated_duration: 30.0
 depends: power-management/battery_drain_idle power-management/battery_drain_movie power-management/battery_drain_sleep
 _description:
 PURPOSE:
@@ -205,6 +219,7 @@ _description:
 
 plugin: user-interact-verify
 id: power-management/reboot_manual
+estimated_duration: 120.0
 user:root
 command: shutdown -r now
 _description:
@@ -223,6 +238,7 @@ _description:
 
 plugin: user-interact-verify
 id: power-management/shutdown_manual
+estimated_duration: 120.0
 user: root
 command: shutdown -h now
 _description:
diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in
index ea9cec5..6745ef6 100644
--- a/jobs/stress.txt.in
+++ b/jobs/stress.txt.in
@@ -1,5 +1,6 @@
 plugin: shell
 id: stress/cpu_stress_test
+estimated_duration: 7200.0
 requires:
 package.name == 'stress'
 user: root
@@ -10,6 +11,7 @@ _description:
 
 plugin: shell
 id: power-management/hibernate_30_cycles
+estimated_duration: 5400.00
 depends:
 power-management/hibernate_advanced
 requires:
@@ -31,18 +33,21 @@ _description:
 
 plugin: shell
 id: power-management/hibernate-30-cycles-log-check
+estimated_duration: 1.0
 command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
 _description:
 Automated check of the 30 cycle hibernate log for errors detected by fwts.
 
 plugin: attachment
 id: power-management/hibernate-30-cycle-log-attach
+estimated_duration: 1.0
 command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
 _description:
 Attaches the log from the 30 cycle Hibernate/Resume test if it exists
 
 plugin: shell
 id: power-management/suspend_30_cycles
+estimated_duration: 2400.0
 depends:
 power-management/rtc
 suspend/suspend_advanced
@@ -63,12 +68,14 @@ _description:
 plugin: shell
 id: power-management/suspend-30-cycles-log-check
 depends: power-management/suspend_30_cycles
+estimated_duration: 1.0
 command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 _description:
 Automated check of the 30 cycle hibernate log for errors detected by fwts.
 
 plugin: attachment
 id: power-management/suspend-30-cycle-log-attach
+estimated_duration: 1.0
 depends: power-management/suspend_30_cycles
 command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 _description:
@@ -76,6 +83,7 @@ _description:
 
 plugin: shell
 id: power-management/suspend-30-cycles-time-check
+estimated_duration: 1.0
 depends: power-management/suspend_30_cycles
 command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
 _description:
@@ -83,6 +91,7 @@ _description:
 
 plugin: shell
 id: stress/hibernate_250_cycles
+estimated_duration: 43400.0
 depends: power-management/rtc
 environ: PLAINBOX_SESSION_SHARE
 user: root
@@ -100,12 +109,14 @@ _description:
 
 plugin: attachment
 id: stress/hibernate-250-cycle-log-attach
+estimated_duration: 1.0
 command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log
 _description:
 Attaches the log from the 250 cycle Hibernate/Resume test if it exists
 
 plugin: shell
 id: stress/suspend_250_cycles
+estimated_duration: 18750.0
 depends: power-management/rtc
 environ: PLAINBOX_SESSION_SHARE
 user: root
@@ -123,18 +134,21 @@ _description:
 
 plugin: attachment
 id: stress/suspend-250-cycle-log-attach
+estimated_duration: 1.0
 command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log
 _description:
 Attaches the log from the 250 cycle Suspend/Resume test if it exists
 
 plugin: shell
 id: stress/suspend-250-cycles-time-check
+estimated_duration: 1.0
 command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
 plugin: shell
 id: stress/reboot
+estimated_duration: 4500.0
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
@@ -147,6 +161,7 @@ _description:
 
 plugin: attachment
 id: stress/reboot_log
+estimated_duration: 1.0
 depends: stress/reboot
 command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_reboot.tgz $PLAINBOX_SESSION_SHARE/*reboot.100.log && cat $PLAINBOX_SESSION_SHARE/stress_reboot.tgz
 
@@ -169,6 +184,7 @@ command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_reboot_30.tgz $PLAINBOX_SESSION
 
 plugin: shell
 id: stress/poweroff
+estimated_duration: 4500.0
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
@@ -181,6 +197,7 @@ _description:
 
 plugin: attachment
 id: stress/poweroff_log
+estimated_duration: 1.0
 depends: stress/poweroff
 command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_poweroff.tgz $PLAINBOX_SESSION_SHARE/*poweroff.100.log && cat $PLAINBOX_SESSION_SHARE/stress_poweroff.tgz
 
@@ -203,30 +220,35 @@ command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_poweroff_30.tgz $PLAINBOX_SESSI
 
 plugin: shell
 id: stress/reboot_check
+estimated_duration: 1.0
 depends: stress/reboot
 command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.reboot.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log
 _description: Check logs for the stress reboot (100 cycles) test case
 
 plugin: attachment
 id: stress/reboot_check_log
+estimated_duration: 1.0
 depends: stress/reboot_check
 command:
 tar cvfz $PLAINBOX_SESSION_SHARE/stress_reboot_check.tgz $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log && cat $PLAINBOX_SESSION_SHARE/stress_reboot_check.tgz
 
 plugin: shell
 id: stress/poweroff_check
+estimated_duration: 1.0
 depends: stress/poweroff
 command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.poweroff.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log
 _description: Check logs for the stress poweroff (100 cycles) test case
 
 plugin: attachment
 id: stress/poweroff_check_log
+estimated_duration: 1.0
 depends: stress/poweroff_check
 command:
 tar cvfz $PLAINBOX_SESSION_SHARE/stress_poweroff_check.tgz $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log && cat $PLAINBOX_SESSION_SHARE/stress_poweroff_check.tgz
 
 plugin: shell
 id: stress/graphics
+estimated_duration: 600.0
 requires:
 package.name == 'x11-apps'
 user: root
@@ -237,14 +259,15 @@ _description:
 
 plugin: shell
 id: stress/graphics-tarball
+estimated_duration: 1.0
 requires:
 package.name == 'x11-apps'
-depends: stress/graphics
 command: [ -e $PLAINBOX_SESSION_SHARE/graphics-stress-results ] && tar cvfz $PLAINBOX_SESSION_SHARE/graphics-stress-results.tar.gz $PLAINBOX_SESSION_SHARE/graphics-stress-results
 _description: Attaches the graphics stress results to the submission.
 
 plugin: shell
 id: stress/usb
+estimated_duration: 710.0
 user: root
 command: removable_storage_test -s 10240000 -c 100 -i 3 usb
 _description: Runs a test that transfers 100 10MB files 3 times to usb.
@@ -270,18 +293,21 @@ _description:
 
 plugin: shell
 id: stress/network_restart
+estimated_duration: 1500.0
 user: root
 environ: PLAINBOX_SESSION_SHARE
-command: network_restart -t 1 -o $PLAINBOX_SESSION_SHARE
+command: network_restart -t 100 -o $PLAINBOX_SESSION_SHARE
 _description: Ping ubuntu.com and restart network interfaces 100 times
 
 plugin: attachment
 id: stress/network_restart_log
+estimated_duration: 1.0
 depends: stress/network_restart
 command: file=$PLAINBOX_SESSION_SHARE/network_restart.log; if [ -e "$file" ]; then iconv -t 'ascii' -c "$file"; fi
 
 plugin: manual
 id: stress/wireless_hotkey
+estimated_duration: 60.0
 requires: dmi.product in ['Notebook','Laptop','Portable']
 _description:
 PURPOSE: