Merge lp:~ubuntu-branches/ubuntu/oneiric/checkbox/oneiric-201109020306 into lp:ubuntu/oneiric/checkbox

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/checkbox reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/checkbox/oneiric-201109020306. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

32. By Luke Yelavich on 2011-09-02

Merge branch lp:~apulido/ubuntu/oneiric/checkbox/checkbox_0.12.5

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2011-08-10 21:09:56 +0000
+++ debian/po/de.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-20 13:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German <[e-mail]>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2011-08-10 21:09:56 +0000
+++ debian/po/en_AU.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-21 02:39+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2011-09-01 12:23:07 +0000
+++ debian/po/en_GB.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-09 23:13+0000\n"
 "Last-Translator: Aldo Mann <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/es.po'
--- debian/po/es.po	2011-09-01 12:23:07 +0000
+++ debian/po/es.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-11 04:29+0000\n"
 "Last-Translator: Fitoschido <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -70,7 +69,8 @@
 #. Description
 #: ../checkbox.templates:4001
 msgid "List of jobs to run when testing with checkbox."
-msgstr "Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
+msgstr ""
+"Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2011-08-10 21:09:56 +0000
+++ debian/po/fr.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-19 10:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <[e-mail]>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/he.po'
--- debian/po/he.po	2011-08-10 21:09:56 +0000
+++ debian/po/he.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-26 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2011-08-10 21:09:56 +0000
+++ debian/po/hu.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 12:57+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/it.po'
--- debian/po/it.po	2011-08-10 21:09:56 +0000
+++ debian/po/it.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-20 14:04+0000\n"
 "Last-Translator: Sergio Zanchetta <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2011-08-10 21:09:56 +0000
+++ debian/po/ja.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-25 17:03+0000\n"
 "Last-Translator: Fumihito YOSHIDA <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,9 +30,8 @@
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
 msgstr ""
-"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどう"
-"か、checkboxが確認するようになります。これはapportが有効になっていなくても機"
-"能します。"
+"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどうか、checkboxが確認するようになります。これはapportが有効になって"
+"いなくても機能します。"
 
 #. Type: string
 #. Description
@@ -47,9 +45,7 @@
 msgid ""
 "When filing a new bug through checkbox, if it does not guess the  package, "
 "the default package that the bug will be file against."
-msgstr ""
-"checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デ"
-"フォルトのパッケージ名を用いて報告します。"
+msgstr "checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デフォルトのパッケージ名を用いて報告します。"
 
 #. Type: string
 #. Description
 
=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2011-09-01 12:23:07 +0000
+++ debian/po/nl.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-17 12:02+0000\n"
 "Last-Translator: Rachid <Unknown>\n"
 "Language-Team: Dutch <[e-mail]>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2011-08-10 21:09:56 +0000
+++ debian/po/pl.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 21:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <[e-mail]>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2011-08-10 21:09:56 +0000
+++ debian/po/pt_BR.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-19 02:00+0000\n"
 "Last-Translator: André Gondim <Unknown>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2011-08-10 21:09:56 +0000
+++ debian/po/ru.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <[e-mail]>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2011-08-10 21:09:56 +0000
+++ debian/po/zh_TW.po	2011-09-02 22:56:24 +0000
@@ -6,12 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-26 15:03+0000\n"
 "Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Chinese (Traditional) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,9 +29,7 @@
 msgid ""
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提"
-"交失敗測試的臭蟲回報。"
+msgstr "若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提交失敗測試的臭蟲回報。"
 
 #. Type: string
 #. Description
 
=== added file 'jobs/hibernate.txt.in'
--- jobs/hibernate.txt.in	1970-01-01 00:00:00 +0000
+++ jobs/hibernate.txt.in	2011-09-02 22:56:24 +0000
@@ -0,0 +1,14 @@
+plugin: manual
+name: power-management/hibernate_advanced
+depends: power-management/rtc
+requires: package.name == 'pm-utils'
+user: root
+command: sleep_test -s disk -w 120 --debug
+_description:
+ This will check to make sure your system can successfully hibernate (if supported).
+ .
+ Select Test to begin. The system will hibernate and should wake itself within 5 minutes.  If your system does not wake itself after 5 minutes, please press the power button to wake the system manually. If the system fails to resume from hibernate, please restart System Testing and mark this test as Failed.
+ .
+ Did the system successfully hibernate and did it work properly after waking up?
+
+
 
=== renamed file 'jobs/hibernate.txt.in' => 'jobs/hibernate.txt.in.moved'
=== added file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	1970-01-01 00:00:00 +0000
+++ jobs/suspend.txt.in	2011-09-02 22:56:24 +0000
@@ -0,0 +1,209 @@
+
+plugin: shell
+name: suspend/resolution_before_suspend
+_description: Record the current resolution before suspending.
+command: xrandr -q |grep '*'| awk '{print $1}' > $CHECKBOX_DATA/resolution_before_suspend.txt
+
+plugin: shell
+name: suspend/audio_before_suspend
+requires:
+ device.category == 'AUDIO'
+ package.name == 'alsa-base'
+_description: Test the audio before suspending.
+command: amixer > $CHECKBOX_DATA/audio_before_suspend.txt
+
+plugin: shell
+name: suspend/cpu_before_suspend
+requires:
+ package.name == 'linux'
+_description: Check all the CPUs are online before suspending
+command: cpuinfo_resource > $CHECKBOX_DATA/cpuinfo_before_suspend
+
+plugin: shell
+name: suspend/memory_before_suspend
+requires:
+ package.name == 'linux'
+_description:
+ Dumps memory info to a file for comparison after suspend test has been run
+command: meminfo_resource > $CHECKBOX_DATA/meminfo_before_suspend
+
+plugin: shell
+name: suspend/wireless_before_suspend
+depends: networking/wireless_connection
+command: nmcli -t -f DEVICES con status >> $CHECKBOX_DATA/iface && connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && reconnect `cat $CHECKBOX_DATA/iface`
+_description:
+ This test disconnects all connections and then connects to the wireless
+ interface. It then checks the connection to confirm it's working as expected.
+
+plugin: shell
+name: suspend/bluetooth_obex_before_suspend
+requires: package.name == 'bluez' and package.name == 'obexd-client'
+command: obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+_description:
+ This test sends an image to the device specified by the BTDEVADDR environment variable.
+
+plugin: manual
+name: suspend/bluetooth_obex_before_suspend_manual
+requires: package.name == 'bluez' and package.name == 'obexd-client'
+command: obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+_description:
+ This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a specified device.
+ .
+ Select Test and you will be prompted to enter the Bluetooth device name of a device that can accept file transfers. It may take a few moments after entering the name for the file to begin sending. Accept any prompts that appear on both devices.
+
+plugin: manual
+name: suspend/suspend_advanced
+depends: power-management/rtc networking/detect suspend/resolution_before_suspend suspend/wireless_before_suspend bluetooth/detect-output suspend/bluetooth_mouse_before_suspend suspend/cpu_before_suspend suspend/memory_before_suspend
+requires: package.name == 'pm-utils'
+_description:
+ Power management Suspend and Resume test
+ .
+ Select Test and your system will suspend for about 30 - 60 seconds. If your system does not wake itself up after 60 seconds, please press the power button momentarily to wake the system manually. If your system fails to wake at all and must be rebooted, restart System Testing after reboot and mark this test as Failed.
+user: root
+command: sleep_test -d
+
+plugin: shell
+name: suspend/network_after_suspend
+depends: suspend/suspend_advanced networking/detect
+_description: Test the network after resuming.
+command: internet_test
+
+plugin: shell
+name: suspend/resolution_after_suspend
+depends: suspend/suspend_advanced suspend/resolution_before_suspend
+_description: Test to see that we have the same resolution after resuming as before.
+command: xrandr -q |grep '*'| awk '{print $1}' | diff $CHECKBOX_DATA/resolution_before_suspend.txt -
+
+plugin: shell
+name: suspend/audio_after_suspend
+requires:
+ device.category == 'AUDIO'
+ package.name == 'alsa-base'
+depends: suspend/suspend_advanced suspend/audio_before_suspend
+_description: Test the audio after resuming.
+command: amixer | diff $CHECKBOX_DATA/audio_before_suspend.txt -
+
+plugin: shell
+name: suspend/cpu_after_suspend
+requires:
+ package.name == 'linux'
+depends: suspend/suspend_advanced suspend/cpu_before_suspend
+_description: Check all CPUs are online after resuming.
+command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
+
+plugin: shell
+name: suspend/memory_after_suspend
+requires:
+ package.name == 'linux'
+depends: suspend/suspend_advanced suspend/memory_before_suspend
+_description:
+ Check that all memory is available after resuming from suspend.
+command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
+
+plugin: manual
+name: suspend/display_after_suspend
+requires:
+ package.name == 'linux'
+depends: suspend/suspend_advanced
+_description:
+ Does the display work normally after resuming from suspend?
+
+plugin: shell
+name: suspend/wireless_after_suspend
+depends: suspend/suspend_advanced suspend/wireless_before_suspend
+command: nmcli -t -f DEVICES con status >> $CHECKBOX_DATA/iface && connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && reconnect `cat $CHECKBOX_DATA/iface`
+_description:
+ This test checks that the wireless interface is working after suspending the system. It
+ disconnects all interfaces and then connects to the wireless interface and checks that the
+ connection is working as expected.
+
+plugin: shell
+name: suspend/bluetooth_detect_after_suspend
+depends: suspend/suspend_advanced bluetooth/detect-output
+requires: package.name == 'bluez'
+command: grep -q "`hcitool dev | tail -n+2 | awk '{print $2}'`" $CHECKBOX_DATA/bluetooth_address 
+_description:
+ This test grabs the hardware address of the bluetooth adapter after suspend and compares it to the address grabbed before suspend.
+
+plugin: shell
+name: suspend/bluetooth_obex_after_suspend
+depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend
+requires: package.name == 'bluez' and package.name == 'obexd-client'
+command: obex_send $BTDEVADDR $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+_description:
+ This test sends an image to the device specified by the BTDEVADDR environment variable.
+
+plugin: manual
+name: suspend/bluetooth_obex_after_suspend_manual
+depends: suspend/suspend_advanced suspend/bluetooth_obex_before_suspend_manual
+requires: package.name == 'bluez' and package.name == 'obexd-client'
+command: obex_send `bluetooth_scan` $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg
+_description:
+ This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a specified device.
+  .
+  Select Test and you will be prompted to enter the Bluetooth device name of a device that can accept file transfers. It may take a few moments after entering the name for the file to begin sending. Accept any prompts that appear on both devices.
+
+plugin: manual
+name: suspend/cycle_resolutions_after_suspend
+requires: package.name == 'xorg'
+depends: suspend/suspend_advanced graphics/xrandr_cycle
+_description:
+ This test will check to make sure that supported video modes work after a suspend and resume.  Select Test to begin.
+command: xrandr_cycle --keyword=after_suspend
+
+plugin: shell
+name: suspend/cycle_resolutions_after_suspend_auto
+requires: package.name == 'xorg'
+depends: suspend/suspend_advanced graphics/xrandr_cycle
+_description:
+ This test will check to make sure supported video modes work after a suspend and resume.
+ This is done automatically by taking screenshots and uploading them as an attachment.
+command: xrandr_cycle --keyword=after_suspend
+
+plugin: attachment
+name: suspend/xrandr_screens_after_suspend.tar.gz
+depends: suspend/cycle_resolutions_after_suspend_auto
+command: [ -e $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz ] && cat $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz 
+
+plugin: manual
+name: suspend/usb_storage_after_suspend
+depends: suspend/suspend_advanced
+command: usb_test -t
+_description:
+ This will test that USB functionality is restored after a suspend and resume cycle.
+ 1. Plug in at least one USB storage device if one is not already connected.
+ 2. Click Test to begin.
+ .
+ If the test is successful, you'll notice that Yes is now selected. Otherwise, No shoud be selected.
+
+plugin: shell
+name: suspend/record_playback_after_suspend
+depends: suspend/suspend_advanced
+requires:
+ device.category == 'AUDIO'
+ package.name == 'sox'
+ package.name == 'alsa-base'
+command: audio_test
+_description:
+ This will check to make sure that your audio device works properly after a suspend and resume.  This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
+
+plugin: shell
+name: suspend/suspend_advanced_auto
+depends: power-management/rtc networking/detect suspend/cpu_before_suspend suspend/memory_before_suspend
+requires: package.name == 'pm-utils'
+_description:
+ Automatic power management Suspend and Resume test
+ .
+ Select test and your system will suspend for about 30 - 60 seconds. If your system does not wake itself up after 60 seconds, please press the power button momentarily to wake the system manually. If your system fails to wake at all and must be rebooted, restart System Testing after reboot and mark this test as Failed.
+user: root
+command: sleep_test -d
+
+plugin: shell
+name: suspend/wake_on_lan
+depends: power-management/rtc suspend/suspend_advanced 
+requires: package.name == 'pm-utils' and package.name == 'util-linux'
+_description:
+ This automatically tests Wake-on-LAN capability with the aid of a suitably configured server. During this process the system will suspend, then automatically wake up after no more than 5 minutes.
+user: root
+command: wake_on_lan_test ${WAKE_ON_LAN_URL} --debug
+
 
=== renamed file 'jobs/suspend.txt.in' => 'jobs/suspend.txt.in.moved'
=== added file 'jobs/wireless.txt.in'
--- jobs/wireless.txt.in	1970-01-01 00:00:00 +0000
+++ jobs/wireless.txt.in	2011-09-02 22:56:24 +0000
@@ -0,0 +1,20 @@
+plugin: shell
+name: wireless/wireless_scanning
+user: root
+requires: package.name == 'wireless-tools'
+command: network_wireless_test
+_description: Wireless scanning test.
+
+plugin: manual
+name: wireless/wireless_connection
+command: network_check
+requires: device.category == 'WIRELESS'
+_description:
+ Wireless network connection procedure:
+ 1.- Click on the Network Manager applet
+ 2.- Select a network below the 'Wireless networks' section
+ 3.- Notify OSD should confirm that the connection has been established
+ 4.- Select Test to verify that it's possible to establish an HTTP connection
+ .
+ Was the connection correctly established?
+
 
=== renamed file 'jobs/wireless.txt.in' => 'jobs/wireless.txt.in.moved'
=== added file 'scripts/audio_test'
--- scripts/audio_test	1970-01-01 00:00:00 +0000
+++ scripts/audio_test	2011-09-02 22:56:24 +0000
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+OUTPUT=`mktemp -u`.wav
+GST_COMMAND_OLD="/usr/bin/gst-launch"
+GST_COMMAND_NEW="/usr/bin/gst-launch-0.10"
+GST_COMMAND_OPTS="audiotestsrc wave=sine freq=512 ! audioconvert !
+audioresample ! gconfaudiosink"
+#SOX_COMMAND="rec -q -r 44100 -p | sox -p $OUTPUT silence -l 1 00:00:00.5 -45d -1 00:00:00.5 -45d"
+REC_COMMAND="rec -q -r 44100 $OUTPUT"
+SOX_COMMAND="sox $OUTPUT $OUTPUT.1.wav silence -l 1 00:00:00.5 -45d -1 00:00:00.5 -45d"
+
+# Start playing a sine wave
+if [ -e $GST_COMMAND_OLD ]; then
+    $GST_COMMAND_OLD $GST_COMMAND_OPTS &
+else
+    $GST_COMMAND_NEW $GST_COMMAND_OPTS &
+fi
+GST_PID=$!
+
+# Listen for it on the audio input
+$REC_COMMAND &
+REC_PID=$!
+
+# Wait a bit, then stop playing
+sleep 2
+echo "Killing REC_COMMAND PID: $REC_PID and GST_COMMAND PID: $GST_PID"
+kill $REC_PID $GST_PID
+
+# Look for silence
+$SOX_COMMAND
+# See if the filesize > 80 bytes on the output file
+# (80 bytes is the largest wav file that will be generated for silence,
+# so if we have that size we detected nothing but silence)
+FILESIZE=`stat -c%s "$OUTPUT.1.wav"`
+rm "$OUTPUT" "$OUTPUT.1.wav"
+if [ "$FILESIZE" == "" ]
+then
+    echo "Unable to find output file." >&2
+    exit 2
+fi
+
+if [ "$FILESIZE" -lt "81" ]
+then
+    echo "No audio detected." >&2
+    exit 1
+else
+    echo "$FILESIZE bytes of audio recorded."
+    exit 0
+fi
 
=== renamed file 'scripts/audio_test' => 'scripts/audio_test.moved'