Merge lp:~cgregan/checkbox/times-update-local into lp:checkbox

[Chris Gregan]

[Daniel Manrique (roadmr)]

SOme local tests (see the ones at the beginning) have a duration of 10 seconds, while the ones at the end have 0.250 seconds. We should standardize them all. Remember this is only the local job that generates the sub-jobs; the subjobs themselves have their own duration specified elsewhere.

review: Needs Fixing

[Daniel Manrique (roadmr)]

In the time since this MR, a lot of the tests were updated with estimated_duration. It's probably worth revisiting this and leaving only the ones that don't already have a duration. Just so it doesn't go into "merge request hell" and stays here for years.

[Zygmunt Krynicki (zyga)]

Rejecting, please re-post if you have any updates

review: Disapprove

Unmerged revisions

2805. By Chris Gregan on 2014-03-19

Updated local test times

=== modified file 'checkbox-old/jobs/ethernet.txt.in'
--- checkbox-old/jobs/ethernet.txt.in	2014-02-13 18:51:02 +0000
+++ checkbox-old/jobs/ethernet.txt.in	2014-03-20 13:28:05 +0000
@@ -34,6 +34,7 @@
 
 plugin: local
 name: ethernet/multi_nic
+estimated_duration: 10.0
 requires: device.category == 'NETWORK'
 _description: Automated test to walk multiple network cards and test each one in sequence.
 command:
@@ -53,6 +54,7 @@
 
 plugin: local
 name: ethernet/ethtool_info
+estimated_duration: 10.0
 requires:
  device.category == 'NETWORK'
 command: 
@@ -70,6 +72,7 @@
 
 plugin: local
 name: ethernet/maximum_bandwidth
+estimated_duration: 10.0
 requires:
  device.category == 'NETWORK'
  package.name == 'zenity'
@@ -97,6 +100,7 @@
 
 plugin: local
 name: ethernet/stress_performance
+estimated_duration: 10.0
 requires:
   device.category == 'NETWORK'
 _description: Automated test that tests performance of each wired network device under stress.

=== modified file 'checkbox-old/jobs/graphics.txt.in'
--- checkbox-old/jobs/graphics.txt.in	2014-02-26 09:12:32 +0000
+++ checkbox-old/jobs/graphics.txt.in	2014-03-20 13:28:05 +0000
@@ -13,6 +13,7 @@
 
 plugin: manual
 name: graphics/resolution-change
+estimated_duration: 120.0
 depends: graphics/xorg-version
 _description:
  PURPOSE:
@@ -64,7 +65,7 @@
  device.category == 'VIDEO'
  package.name == 'qmlscene'
 command: timeout 5 qmlscene --transparent --fullscreen $CHECKBOX_SHARE/scripts/resolution_test.qml
-estimated_duration: 10
+estimated_duration: 10.0
 _description:
  PURPOSE:
      This test will verify the default display resolution
@@ -91,7 +92,7 @@
  device.category == 'VIDEO'
  package.name == 'zenity'
 command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
-estimated_duration: 10
+estimated_duration: 10.0
 _description:
  PURPOSE:
      This test will verify the display is operating at its maximum supported resolution 
@@ -116,15 +117,18 @@
 name: graphics/fresh_rate
 plugin: shell
 command: fresh_rate_info
+estimated_duration: 0.250
 _description: Collect info on fresh rate.
 
 name: graphics/graphic_memory
 plugin: shell
 command: graphic_memory_info
+estimated_duration: 0.250
 _description: Collect info on graphic memory.
 
 plugin: user-verify
 name: graphics/display
+estimated_duration: 120.0
 requires: 
  package.name == 'xorg'
  package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
@@ -188,6 +192,7 @@
 plugin: user-verify
 name: graphics/glxgears
 requires: package.name == 'mesa-utils'
+estimated_duration: 120.0
 command: glxgears; true
 _description:
  PURPOSE:
@@ -229,6 +234,7 @@
 
 plugin: shell
 name: graphics/screenshot
+estimated_duration: 1.0
 requires: package.name == 'fswebcam'
 command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
 _description:
@@ -248,6 +254,7 @@
 plugin: shell
 name: graphics/screenshot_fullscreen_video
 requires: package.name == 'fswebcam'
+estimated_duration: 120.0
 command:
  [ -f ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
  dbus-launch gsettings set org.gnome.totem repeat true
@@ -274,6 +281,7 @@
 plugin: shell
 name: graphics/screenshot_opencv_validation
 requires: package.name == 'python-opencv'
+estimated_duration: 10.0
 environ: EXTERNAL_WEBCAM_DEVICE
 command:
  screenshot_validation \

=== modified file 'checkbox-old/jobs/networking.txt.in'
--- checkbox-old/jobs/networking.txt.in	2013-12-22 14:57:08 +0000
+++ checkbox-old/jobs/networking.txt.in	2014-03-20 13:28:05 +0000
@@ -8,6 +8,7 @@
 plugin: local
 name: networking/info
 requires: device.category == 'NETWORK'
+estimated_duration: 10.0
 _description: Network Information
 command:
  cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
@@ -15,6 +16,7 @@
  name: networking/info_$2
  requires: device.path == "$1"
  command: network_info $2 | zenity --text-info --title="$2"
+ estimated_duration: 120.0
  _description:
   PURPOSE:
       This test will check the $2 network interface
@@ -43,18 +45,21 @@
 
 plugin: shell
 name: networking/ping
+estimated_duration: 10.0
 command: gateway_ping_test $CHECKBOX_SERVER
 _description:
  Automated test case to verify availability of some system on the network using ICMP ECHO packets.
 
 plugin: shell
 name: networking/http
+estimated_duration: 10.0
 command: wget -SO /dev/null http://$TRANSFER_SERVER
 _description:
  Automated test case to make sure that it's possible to download files through HTTP
 
 plugin: shell
 name: networking/ntp
+estimated_duration: 10.0
 requires: package.name == 'ntpdate'
 user: root
 command: network_ntp_test
@@ -62,6 +67,7 @@
 
 plugin: shell
 name: networking/ssh
+estimated_duration: 10.0
 requires: package.name == 'openssh-client'
 command: if [ $CHECKBOX_SERVER ]; then ssh -q -o 'StrictHostKeyChecking=no' -o "UserKnownHostsFile=/tmp/ssh_test_$$" -l ubuntu $CHECKBOX_SERVER "uname -a" && rm /tmp/ssh_test_$$; fi
 _description: Verify that an installation of checkbox-server on the network can be reached over SSH.

=== modified file 'checkbox-old/jobs/suspend.txt.in'
--- checkbox-old/jobs/suspend.txt.in	2014-03-12 18:45:28 +0000
+++ checkbox-old/jobs/suspend.txt.in	2014-03-20 13:28:05 +0000
@@ -45,6 +45,7 @@
 
 plugin: local
 name: suspend/iperf_before_suspend_ether_auto
+estimated_duration: 0.250
 requires:
  device.category == 'NETWORK'
 command: 
@@ -64,6 +65,7 @@
 
 plugin: local
 name: suspend/iperf_before_suspend_wifi_auto
+estimated_duration: 0.250
 requires:
  device.category == 'WIRELESS'
 command: 

=== modified file 'checkbox-old/jobs/usb.txt.in'
--- checkbox-old/jobs/usb.txt.in	2014-02-26 17:00:22 +0000
+++ checkbox-old/jobs/usb.txt.in	2014-03-20 13:28:05 +0000
@@ -188,6 +188,7 @@
 
 plugin: manual
 name: usb/panels
+estimated_duration: 120.0
 _description:
  PURPOSE:
      This test will check your USB connection.

=== modified file 'checkbox-old/jobs/wireless.txt.in'
--- checkbox-old/jobs/wireless.txt.in	2014-02-20 08:02:44 +0000
+++ checkbox-old/jobs/wireless.txt.in	2014-03-20 13:28:05 +0000
@@ -318,6 +318,7 @@
 
 plugin: local
 name: wireless/stress_performance
+estimated_duration: 0.250
 requires:
   device.category == 'NETWORK'
 _description: Automated test that tests performance of each wireless network device under stress.
@@ -388,6 +389,7 @@
 
 plugin: local
 name: wireless/maximum_bandwidth
+estimated_duration: 0.250
 requires:
  device.category == 'WIRELESS'
  package.name == 'zenity'