Checkbox

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

  1. times-update-local
  2. Merge into trunk
Proposed by Chris Gregan
Status: Rejected
Rejected by: Zygmunt Krynicki
Proposed branch: lp:~cgregan/checkbox/times-update-local
Merge into: lp:checkbox
Diff against target: 218 lines (+25/-2)
6 files modified
checkbox-old/jobs/ethernet.txt.in (+4/-0)
checkbox-old/jobs/graphics.txt.in (+10/-2)
checkbox-old/jobs/networking.txt.in (+6/-0)
checkbox-old/jobs/suspend.txt.in (+2/-0)
checkbox-old/jobs/usb.txt.in (+1/-0)
checkbox-old/jobs/wireless.txt.in (+2/-0)
To merge this branch: bzr merge lp:~cgregan/checkbox/times-update-local
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Disapprove
Daniel Manrique (community) Needs Fixing
Review via email: mp+211935@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

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
Revision history for this message
Daniel Manrique (roadmr) wrote :

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.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Rejecting, please re-post if you have any updates

review: Disapprove

Unmerged revisions

2805. By Chris Gregan

Updated local test times

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
3434
35plugin: local35plugin: local
36name: ethernet/multi_nic36name: ethernet/multi_nic
37estimated_duration: 10.0
37requires: device.category == 'NETWORK'38requires: device.category == 'NETWORK'
38_description: Automated test to walk multiple network cards and test each one in sequence.39_description: Automated test to walk multiple network cards and test each one in sequence.
39command:40command:
@@ -53,6 +54,7 @@
5354
54plugin: local55plugin: local
55name: ethernet/ethtool_info56name: ethernet/ethtool_info
57estimated_duration: 10.0
56requires:58requires:
57 device.category == 'NETWORK'59 device.category == 'NETWORK'
58command: 60command:
@@ -70,6 +72,7 @@
7072
71plugin: local73plugin: local
72name: ethernet/maximum_bandwidth74name: ethernet/maximum_bandwidth
75estimated_duration: 10.0
73requires:76requires:
74 device.category == 'NETWORK'77 device.category == 'NETWORK'
75 package.name == 'zenity'78 package.name == 'zenity'
@@ -97,6 +100,7 @@
97100
98plugin: local101plugin: local
99name: ethernet/stress_performance102name: ethernet/stress_performance
103estimated_duration: 10.0
100requires:104requires:
101 device.category == 'NETWORK'105 device.category == 'NETWORK'
102_description: Automated test that tests performance of each wired network device under stress.106_description: Automated test that tests performance of each wired network device under stress.
103107
=== 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 @@
1313
14plugin: manual14plugin: manual
15name: graphics/resolution-change15name: graphics/resolution-change
16estimated_duration: 120.0
16depends: graphics/xorg-version17depends: graphics/xorg-version
17_description:18_description:
18 PURPOSE:19 PURPOSE:
@@ -64,7 +65,7 @@
64 device.category == 'VIDEO'65 device.category == 'VIDEO'
65 package.name == 'qmlscene'66 package.name == 'qmlscene'
66command: timeout 5 qmlscene --transparent --fullscreen $CHECKBOX_SHARE/scripts/resolution_test.qml67command: timeout 5 qmlscene --transparent --fullscreen $CHECKBOX_SHARE/scripts/resolution_test.qml
67estimated_duration: 1068estimated_duration: 10.0
68_description:69_description:
69 PURPOSE:70 PURPOSE:
70 This test will verify the default display resolution71 This test will verify the default display resolution
@@ -91,7 +92,7 @@
91 device.category == 'VIDEO'92 device.category == 'VIDEO'
92 package.name == 'zenity'93 package.name == 'zenity'
93command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"94command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
94estimated_duration: 1095estimated_duration: 10.0
95_description:96_description:
96 PURPOSE:97 PURPOSE:
97 This test will verify the display is operating at its maximum supported resolution 98 This test will verify the display is operating at its maximum supported resolution
@@ -116,15 +117,18 @@
116name: graphics/fresh_rate117name: graphics/fresh_rate
117plugin: shell118plugin: shell
118command: fresh_rate_info119command: fresh_rate_info
120estimated_duration: 0.250
119_description: Collect info on fresh rate.121_description: Collect info on fresh rate.
120122
121name: graphics/graphic_memory123name: graphics/graphic_memory
122plugin: shell124plugin: shell
123command: graphic_memory_info125command: graphic_memory_info
126estimated_duration: 0.250
124_description: Collect info on graphic memory.127_description: Collect info on graphic memory.
125128
126plugin: user-verify129plugin: user-verify
127name: graphics/display130name: graphics/display
131estimated_duration: 120.0
128requires: 132requires:
129 package.name == 'xorg'133 package.name == 'xorg'
130 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'134 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
@@ -188,6 +192,7 @@
188plugin: user-verify192plugin: user-verify
189name: graphics/glxgears193name: graphics/glxgears
190requires: package.name == 'mesa-utils'194requires: package.name == 'mesa-utils'
195estimated_duration: 120.0
191command: glxgears; true196command: glxgears; true
192_description:197_description:
193 PURPOSE:198 PURPOSE:
@@ -229,6 +234,7 @@
229234
230plugin: shell235plugin: shell
231name: graphics/screenshot236name: graphics/screenshot
237estimated_duration: 1.0
232requires: package.name == 'fswebcam'238requires: package.name == 'fswebcam'
233command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser239command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
234_description:240_description:
@@ -248,6 +254,7 @@
248plugin: shell254plugin: shell
249name: graphics/screenshot_fullscreen_video255name: graphics/screenshot_fullscreen_video
250requires: package.name == 'fswebcam'256requires: package.name == 'fswebcam'
257estimated_duration: 120.0
251command:258command:
252 [ -f ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }259 [ -f ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
253 dbus-launch gsettings set org.gnome.totem repeat true260 dbus-launch gsettings set org.gnome.totem repeat true
@@ -274,6 +281,7 @@
274plugin: shell281plugin: shell
275name: graphics/screenshot_opencv_validation282name: graphics/screenshot_opencv_validation
276requires: package.name == 'python-opencv'283requires: package.name == 'python-opencv'
284estimated_duration: 10.0
277environ: EXTERNAL_WEBCAM_DEVICE285environ: EXTERNAL_WEBCAM_DEVICE
278command:286command:
279 screenshot_validation \287 screenshot_validation \
280288
=== 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 @@
8plugin: local8plugin: local
9name: networking/info9name: networking/info
10requires: device.category == 'NETWORK'10requires: device.category == 'NETWORK'
11estimated_duration: 10.0
11_description: Network Information12_description: Network Information
12command:13command:
13 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"'14 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 @@
15 name: networking/info_$216 name: networking/info_$2
16 requires: device.path == "$1"17 requires: device.path == "$1"
17 command: network_info $2 | zenity --text-info --title="$2"18 command: network_info $2 | zenity --text-info --title="$2"
19 estimated_duration: 120.0
18 _description:20 _description:
19 PURPOSE:21 PURPOSE:
20 This test will check the $2 network interface22 This test will check the $2 network interface
@@ -43,18 +45,21 @@
4345
44plugin: shell46plugin: shell
45name: networking/ping47name: networking/ping
48estimated_duration: 10.0
46command: gateway_ping_test $CHECKBOX_SERVER49command: gateway_ping_test $CHECKBOX_SERVER
47_description:50_description:
48 Automated test case to verify availability of some system on the network using ICMP ECHO packets.51 Automated test case to verify availability of some system on the network using ICMP ECHO packets.
4952
50plugin: shell53plugin: shell
51name: networking/http54name: networking/http
55estimated_duration: 10.0
52command: wget -SO /dev/null http://$TRANSFER_SERVER56command: wget -SO /dev/null http://$TRANSFER_SERVER
53_description:57_description:
54 Automated test case to make sure that it's possible to download files through HTTP58 Automated test case to make sure that it's possible to download files through HTTP
5559
56plugin: shell60plugin: shell
57name: networking/ntp61name: networking/ntp
62estimated_duration: 10.0
58requires: package.name == 'ntpdate'63requires: package.name == 'ntpdate'
59user: root64user: root
60command: network_ntp_test65command: network_ntp_test
@@ -62,6 +67,7 @@
6267
63plugin: shell68plugin: shell
64name: networking/ssh69name: networking/ssh
70estimated_duration: 10.0
65requires: package.name == 'openssh-client'71requires: package.name == 'openssh-client'
66command: if [ $CHECKBOX_SERVER ]; then ssh -q -o 'StrictHostKeyChecking=no' -o "UserKnownHostsFile=/tmp/ssh_test_$$" -l ubuntu $CHECKBOX_SERVER "uname -a" && rm /tmp/ssh_test_$$; fi72command: 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
67_description: Verify that an installation of checkbox-server on the network can be reached over SSH.73_description: Verify that an installation of checkbox-server on the network can be reached over SSH.
6874
=== 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 @@
4545
46plugin: local46plugin: local
47name: suspend/iperf_before_suspend_ether_auto47name: suspend/iperf_before_suspend_ether_auto
48estimated_duration: 0.250
48requires:49requires:
49 device.category == 'NETWORK'50 device.category == 'NETWORK'
50command: 51command:
@@ -64,6 +65,7 @@
6465
65plugin: local66plugin: local
66name: suspend/iperf_before_suspend_wifi_auto67name: suspend/iperf_before_suspend_wifi_auto
68estimated_duration: 0.250
67requires:69requires:
68 device.category == 'WIRELESS'70 device.category == 'WIRELESS'
69command: 71command:
7072
=== 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 @@
188188
189plugin: manual189plugin: manual
190name: usb/panels190name: usb/panels
191estimated_duration: 120.0
191_description:192_description:
192 PURPOSE:193 PURPOSE:
193 This test will check your USB connection.194 This test will check your USB connection.
194195
=== 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 @@
318318
319plugin: local319plugin: local
320name: wireless/stress_performance320name: wireless/stress_performance
321estimated_duration: 0.250
321requires:322requires:
322 device.category == 'NETWORK'323 device.category == 'NETWORK'
323_description: Automated test that tests performance of each wireless network device under stress.324_description: Automated test that tests performance of each wireless network device under stress.
@@ -388,6 +389,7 @@
388389
389plugin: local390plugin: local
390name: wireless/maximum_bandwidth391name: wireless/maximum_bandwidth
392estimated_duration: 0.250
391requires:393requires:
392 device.category == 'WIRELESS'394 device.category == 'WIRELESS'
393 package.name == 'zenity'395 package.name == 'zenity'

Subscribers

People subscribed via source and target branches