Merge lp:~kelemeng/checkbox/bug868571 into lp:checkbox

[Gabor Kelemen]

[Brendan Donegan (brendan-donegan)]

Hi Gabor,

Apologies, but Checkbox has moved under your feet since you submitted this merge proposal. Could you branch trunk again and check the descriptions? They have mostly been changed to a new format so some of your merge may not apply.

Thanks,

review: Needs Fixing

[Gabor Kelemen (kelemeng)]

The new format solved most of these, thanks! This branch is no longer necessary, but I'll attach a patch to the original bug to clean up the last two backslashes.

[Daniel Manrique (roadmr)]

I'll reject this merge request based on the previous two comments, as it's no longer necessary. I've merged Gabor's patch for the remaining broken strings, it's in trunk now.

Thanks!

Unmerged revisions

1091. By Gabor Kelemen on 2011-10-05

Remove useless line break markers (\). Second half of LP: #868571.

1090. By Gabor Kelemen on 2011-10-05

Change lines that are intended to contain a line break to start
with two spaces. LP: #868571.

=== modified file 'jobs/audio.txt.in'
--- jobs/audio.txt.in	2011-09-20 13:04:42 +0000
+++ jobs/audio.txt.in	2011-10-05 18:01:25 +0000
@@ -80,6 +80,6 @@
  device.category == 'AUDIO'
 command: audio_test
 _description:
- Play back a sound on the default output and listen for it on the \
- default input.  This makes the most sense when the output and input \
+ Play back a sound on the default output and listen for it on the 
+ default input.  This makes the most sense when the output and input 
  are directly connected, as with a patch cable.

=== modified file 'jobs/bluetooth.txt.in'
--- jobs/bluetooth.txt.in	2011-08-29 11:24:45 +0000
+++ jobs/bluetooth.txt.in	2011-10-05 18:01:25 +0000
@@ -17,15 +17,15 @@
 depends: bluetooth/detect
 _description:
  Bluetooth browse files procedure:
- 1.- Enable bluetooth on any mobile device (PDA, smartphone, etc.)
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 3.- Look for the device in the list and select it
- 4.- In the device write the PIN code automatically chosen by the wizard
- 5.- The device should pair with the computer
- 6.- Right-click on the bluetooth icon and select browse files
- 7.- Authorize the computer to browse the files in the device if needed
- 8.- You should be able to browse the files
+  1.- Enable bluetooth on any mobile device (PDA, smartphone, etc.)
+  2.- Click on the bluetooth icon in the menu bar
+  3.- Select 'Setup new device'
+  3.- Look for the device in the list and select it
+  4.- In the device write the PIN code automatically chosen by the wizard
+  5.- The device should pair with the computer
+  6.- Right-click on the bluetooth icon and select browse files
+  7.- Authorize the computer to browse the files in the device if needed
+  8.- You should be able to browse the files
  .
  Did all the steps work?
 
@@ -34,11 +34,11 @@
 depends: bluetooth/browse-files bluetooth/detect
 _description:
  Bluetooth file transfer procedure:
- 1.- Make sure that you're able to browse the files in your mobile device
- 2.- Copy a file from the computer to the mobile device
- 3.- Verify that the file was correctly copied
- 4.- Copy a file from the mobile device to the computer
- 5.- Verify that the file was correctly copied
+  1.- Make sure that you're able to browse the files in your mobile device
+  2.- Copy a file from the computer to the mobile device
+  3.- Verify that the file was correctly copied
+  4.- Copy a file from the mobile device to the computer
+  5.- Verify that the file was correctly copied
  .
  Did all the steps work?
 
@@ -49,13 +49,13 @@
 command: arecord -d 5 -D bluetooth -f S16_LE | aplay -D bluetooth -f S16_LE
 _description:
  Bluetooth audio procedure:
- 1.- Enable the bluetooth headset
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 4.- Look for the device in the list and select it
- 5.- In the device write the PIN code automatically chosen by the wizard
- 6.- The device should pair with the computer
- 7.- Select Test to record for five seconds and reproduce in the bluetooth device
+  1.- Enable the bluetooth headset
+  2.- Click on the bluetooth icon in the menu bar
+  3.- Select 'Setup new device'
+  4.- Look for the device in the list and select it
+  5.- In the device write the PIN code automatically chosen by the wizard
+  6.- The device should pair with the computer
+  7.- Select Test to record for five seconds and reproduce in the bluetooth device
  .
  Did all the steps work?
 
@@ -65,11 +65,11 @@
 depends: bluetooth/detect
 _description:
  Bluetooth keyboard procedure:
- 1.- Enable the bluetooth keyboard
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 4.- Look for the device in the list and select it
- 5.- Select Test to enter text
+  1.- Enable the bluetooth keyboard
+  2.- Click on the bluetooth icon in the menu bar
+  3.- Select 'Setup new device'
+  4.- Look for the device in the list and select it
+  5.- Select Test to enter text
  .
  Did all the steps work?
 
@@ -78,11 +78,11 @@
 depends: bluetooth/detect
 _description:
  Bluetooth mouse procedure:
- 1.- Enable the bluetooth mouse
- 2.- Click on the bluetooth icon in the menu bar
- 3.- Select 'Setup new device'
- 4.- Look for the device in the list and select it
- 5.- Move the mouse around the screen
- 6.- Perform some single/double/right click operations
+  1.- Enable the bluetooth mouse
+  2.- Click on the bluetooth icon in the menu bar
+  3.- Select 'Setup new device'
+  4.- Look for the device in the list and select it
+  5.- Move the mouse around the screen
+  6.- Perform some single/double/right click operations
  .
  Did all the steps work?

=== modified file 'jobs/gcalctool.txt.in'
--- jobs/gcalctool.txt.in	2011-06-27 10:22:03 +0000
+++ jobs/gcalctool.txt.in	2011-10-05 18:01:25 +0000
@@ -15,10 +15,10 @@
 _description:
  Click the "Test" button to open the calculator and perform:
  .
- 1. Simple math functions (+,-,/,*)
- 2. Nested math functions ((,))
- 3. Fractional math
- 4. Decimal math
+  1. Simple math functions (+,-,/,*)
+  2. Nested math functions ((,))
+  3. Fractional math
+  4. Decimal math
  .
  Did the functions perform as expected?
 
@@ -30,10 +30,10 @@
 _description:
  Click the "Test" button to open the calculator and perform:
  .
- 1. Memory set
- 2. Memory reset
- 3. Memory last clear
- 4. Memory clear
+  1. Memory set
+  2. Memory reset
+  3. Memory last clear
+  4. Memory clear
  .
  Did the functions perform as expected?
 
@@ -45,8 +45,8 @@
 _description:
  Click the "Test" button to open the calculator and perform:
  .
- 1. Cut
- 2. Copy
- 3. Paste
+  1. Cut
+  2. Copy
+  3. Paste
  .
  Did the functions perform as expected?

=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2011-08-10 13:14:40 +0000
+++ jobs/graphics.txt.in	2011-10-05 18:01:25 +0000
@@ -30,13 +30,13 @@
 depends: graphics/xorg-version-output
 _description:
  Display resolution change procedure:
- 1.- Open System->Preferences->Monitors
- 2.- Select a new resolution from the dropdown list
- 3.- Click on Apply
- 4.- The resolution should change
- 5.- Select the original resolution from the dropdown list
- 6.- Click on Apply
- 7.- The resolution should change again
+  1.- Open System->Preferences->Monitors
+  2.- Select a new resolution from the dropdown list
+  3.- Click on Apply
+  4.- The resolution should change
+  5.- Select the original resolution from the dropdown list
+  6.- Click on Apply
+  7.- The resolution should change again
  .
  Did the resolution change as expected?
 
@@ -45,13 +45,13 @@
 depends: graphics/xorg-version-output
 _description:
  Display rotation verification procedure:
- 1.- Open System->Preferences->Monitors
- 2.- Select a new rotation value from the dropdown list
- 3.- Click on Apply
- 4.- The display should be rotated according to the new configuration value
- 5.- Click on Restore Previous Configuration
- 6.- The display configuration change should be reverted
- 7.- Repeat 2-6 for different rotation values
+  1.- Open System->Preferences->Monitors
+  2.- Select a new rotation value from the dropdown list
+  3.- Click on Apply
+  4.- The display should be rotated according to the new configuration value
+  5.- Click on Restore Previous Configuration
+  6.- The display configuration change should be reverted
+  7.- Repeat 2-6 for different rotation values
  .
  Did the display rotation change as expected?
 

=== modified file 'jobs/keys.txt.in'
--- jobs/keys.txt.in	2011-09-01 10:55:45 +0000
+++ jobs/keys.txt.in	2011-10-05 18:01:25 +0000
@@ -2,7 +2,7 @@
 name: keys/brightness
 requires: device.product in ['Notebook','Laptop','Portable']
 _description:
- Press the brightness buttons on the keyboard. A status window should \
+ Press the brightness buttons on the keyboard. A status window should 
  appear and the brightness should change.
  .
  Do the buttons work?
@@ -10,7 +10,7 @@
 plugin: manual
 name: keys/volume
 _description:
- Press the volume buttons on the keyboard. A status window should \
+ Press the volume buttons on the keyboard. A status window should 
  appear and the volume should change.
  .
  Do the buttons work?
@@ -19,7 +19,7 @@
 name: keys/mute
 requires: device.product in ['Notebook','Laptop','Portable']
 _description:
- Press the mute key on the keyboard. A status window should appear \
+ Press the mute key on the keyboard. A status window should appear 
  and the volume should mute/unmute when pressed multiple times.
  .
  Does the key work?
@@ -29,7 +29,7 @@
 requires: device.product in ['Notebook','Laptop','Portable']
 depends: suspend/suspend_advanced
 _description:
- Press the sleep key on the keyboard. The computer should suspend and, \
+ Press the sleep key on the keyboard. The computer should suspend and, 
  after pressing the power button, resume successfully.
  .
  Does the key work?
@@ -38,7 +38,7 @@
 name: keys/battery-info
 requires: device.product in ['Notebook','Laptop','Portable']
 _description:
- Press the battery information key on the keyboard. A status window \
+ Press the battery information key on the keyboard. A status window 
  should appear and the amount of battery remaining should be displayed.
  .
  Does the key work?
@@ -47,12 +47,12 @@
 name: keys/wireless
 requires: device.product in ['Notebook','Laptop','Portable']
 _description:
- Press the wireless networking key on the keyboard. The bluetooth icon \
- and the network connnection should go down if connected through the \
+ Press the wireless networking key on the keyboard. The bluetooth icon 
+ and the network connnection should go down if connected through the 
  wifi interface.
  .
- Press the same key again and check that bluetooth icon is again \
- displayed and that the network connection is re-established \
+ Press the same key again and check that bluetooth icon is again 
+ displayed and that the network connection is re-established 
  automatically.
  .
  Does the key work?
@@ -63,10 +63,10 @@
 _description:
  The keyboard may have dedicated keys for controlling media as follows:
  .
- * Play/Pause
- * Stop
- * Forward
- * Backward (Rewind)
+  * Play/Pause
+  * Stop
+  * Forward
+  * Backward (Rewind)
  .
  Play a media file and press each key in turn.
  .

=== modified file 'jobs/networking.txt.in'
--- jobs/networking.txt.in	2011-08-30 09:33:13 +0000
+++ jobs/networking.txt.in	2011-10-05 18:01:25 +0000
@@ -38,10 +38,10 @@
 command: network_check
 _description:
  Wired network connection procedure:
- 1.- Click on the Network Manager applet
- 2.- Select a network below the 'Wired network' 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
+  1.- Click on the Network Manager applet
+  2.- Select a network below the 'Wired network' 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?
 
@@ -50,14 +50,14 @@
 command: network_check
 _description:
  Built-in modem network connection procedure:
- 1.- Connect the telephone line to the computer
- 2.- Right click on the Network Manager applet
- 3.- Select 'Edit Connections'
- 4.- Select the 'DSL' tab
- 5.- Click on add 'Add' button
- 6.- Configure the connection parameters properly
- 7.- Notify OSD should confirm that the connection has been established
- 8.- Select Test to verify that it's possible to establish an HTTP connection
+  1.- Connect the telephone line to the computer
+  2.- Right click on the Network Manager applet
+  3.- Select 'Edit Connections'
+  4.- Select the 'DSL' tab
+  5.- Click on add 'Add' button
+  6.- Configure the connection parameters properly
+  7.- Notify OSD should confirm that the connection has been established
+  8.- Select Test to verify that it's possible to establish an HTTP connection
  .
  Was the connection correctly established?
 

=== modified file 'jobs/optical.txt.in'
--- jobs/optical.txt.in	2011-07-06 09:10:24 +0000
+++ jobs/optical.txt.in	2011-10-05 18:01:25 +0000
@@ -35,7 +35,7 @@
 depends: optical/detect
 requires: device.category == 'CDROM'
 _description:
- The detected optical drive seems to support writing. Enter a blank CDROM \
+ The detected optical drive seems to support writing. Enter a blank CDROM 
  into your drive and try writing to it.
  .
  Does writing work?
@@ -45,14 +45,14 @@
 depends: optical/read
 _description:
  CD audio playback procedure:
- 1.- Insert an audio cd in your optical drive.
- 2.- An icon should appear on the desktop.
- 3.- Right-click on the icon and select "Open with Rhythmbox".
- 4.- Select the CD as the playback source and press play button.
- 5.- The music should reproduce.
- 6.- Stop music reproduction after some time.
- 7.- Right click on the desktop icon and select "Eject Volume".
- 8.- The CD should be ejected and the icon removed from the desktop.
+  1.- Insert an audio cd in your optical drive.
+  2.- An icon should appear on the desktop.
+  3.- Right-click on the icon and select "Open with Rhythmbox".
+  4.- Select the CD as the playback source and press play button.
+  5.- The music should reproduce.
+  6.- Stop music reproduction after some time.
+  7.- Right click on the desktop icon and select "Eject Volume".
+  8.- The CD should be ejected and the icon removed from the desktop.
  .
  Did all the steps work?
 
@@ -61,7 +61,7 @@
 depends: optical/detect
 requires: device.category == 'CDROM'
 _description:
- The detected optical drive seems to support writing. Enter a blank DVD \
+ The detected optical drive seems to support writing. Enter a blank DVD 
  into your drive and try writing to it.
  .
  Does writing work?
@@ -71,13 +71,13 @@
 depends: optical/read
 _description:
  DVD movie playback procedure:
- 1.- Insert a DVD that contains any movie in your optical drive.
- 2.- A window should appear with some actions that you may choose. Select 'Open Movie Player'.
- 3.- The player should be opened and the movie should reproduce.
- 4.- Stop movie reproduction after some time.
- 5.- An icon should appear in the desktop.
- 6.- Right click on the icon and select "Eject Volume".
- 7.- The DVD should be ejected and the icon removed from the desktop.
+  1.- Insert a DVD that contains any movie in your optical drive.
+  2.- A window should appear with some actions that you may choose. Select 'Open Movie Player'.
+  3.- The player should be opened and the movie should reproduce.
+  4.- Stop movie reproduction after some time.
+  5.- An icon should appear in the desktop.
+  6.- Right click on the icon and select "Eject Volume".
+  7.- The DVD should be ejected and the icon removed from the desktop.
  .
  Did all the steps work?
 

=== modified file 'jobs/panel_clock_test.txt.in'
--- jobs/panel_clock_test.txt.in	2011-06-27 10:22:03 +0000
+++ jobs/panel_clock_test.txt.in	2011-10-05 18:01:25 +0000
@@ -2,7 +2,7 @@
 plugin: manual
 requires: package.name == 'gnome-system-tools'
 _description:
- Is your gnome system clock displaying the correct date and time for \
+ Is your gnome system clock displaying the correct date and time for 
  your timezone?
 
 name: panel_clock_test
@@ -13,12 +13,12 @@
 command: date -s "`date -d '1 hour'`"
 _description:
  Time verification procedure:
- 1.- Click the "Test" button and verify the clock moves ahead by 1 hour. \
- Note: It may take a minute or so for the gnome clock to refresh 
- 2.- Now from the panel select System, Admistration, then Time and Date
- 3.- Ensure that your clock application is set to manual.
- 4.- Change the time 1 hour back
- 5.- Close the window and reboot
+  1.- Click the "Test" button and verify the clock moves ahead by 1 hour. 
+  Note: It may take a minute or so for the gnome clock to refresh 
+  2.- Now from the panel select System, Admistration, then Time and Date
+  3.- Ensure that your clock application is set to manual.
+  4.- Change the time 1 hour back
+  5.- Close the window and reboot
  .
- Is your system clock displaying the correct date and time for your \
+ Is your system clock displaying the correct date and time for your 
  timezone?

=== modified file 'jobs/panel_reboot.txt.in'
--- jobs/panel_reboot.txt.in	2011-06-27 10:22:03 +0000
+++ jobs/panel_reboot.txt.in	2011-10-05 18:01:25 +0000
@@ -4,7 +4,7 @@
 _description:
  Please restart your machine from the Ubuntu Panel.
  .
- Afterwards be sure to recover the previous Checkbox instance and \
+ Afterwards be sure to recover the previous Checkbox instance and 
  answer the question below:
  .
  Did it restart and bring up the GUI login cleanly?

=== modified file 'jobs/peripheral.txt.in'
--- jobs/peripheral.txt.in	2011-07-07 10:00:04 +0000
+++ jobs/peripheral.txt.in	2011-10-05 18:01:25 +0000
@@ -2,26 +2,26 @@
 name: printer
 _description:
  Printer configuration verification procedure:
- 1.- Make sure that a printer is available in your network
- 2.- Open Systems->Administration->Printing
- 3.- If the printer isn't already listed, click on New
- 4.- The printer should be detected and proper configuration values \
- should be displayed
- 5.- Print a test page
+  1.- Make sure that a printer is available in your network
+  2.- Open Systems->Administration->Printing
+  3.- If the printer isn't already listed, click on New
+  4.- The printer should be detected and proper configuration values 
+  should be displayed
+  5.- Print a test page
 
 plugin: manual
 name: external-usb-modem
 command: network_check
 _description:
  External USB modem network connection procedure:
- 1.- Connect the USB cable to the computer
- 2.- Right click on the Network Manager applet
- 3.- Select 'Edit Connections'
- 4.- Select the 'DSL' (for ADSL modem) or 'Mobile Broadband' (for 3G modem) tab
- 5.- Click on add 'Add' button
- 6.- Configure the connection parameters properly
- 7.- Notify OSD should confirm that the connection has been established
- 8.- Select Test to verify that it's possible to establish an HTTP connection
+  1.- Connect the USB cable to the computer
+  2.- Right click on the Network Manager applet
+  3.- Select 'Edit Connections'
+  4.- Select the 'DSL' (for ADSL modem) or 'Mobile Broadband' (for 3G modem) tab
+  5.- Click on add 'Add' button
+  6.- Configure the connection parameters properly
+  7.- Notify OSD should confirm that the connection has been established
+  8.- Select Test to verify that it's possible to establish an HTTP connection
  .
  Was the connection correctly established?
 

=== modified file 'jobs/power-management.txt.in'
--- jobs/power-management.txt.in	2011-08-30 12:44:49 +0000
+++ jobs/power-management.txt.in	2011-10-05 18:01:25 +0000
@@ -2,9 +2,9 @@
 name: power-management/shutdown-boot
 _description:
  Shutdown/boot cycle verification procedure:
- 1.- Shutdown your machine
- 2.- Boot your machine
- 3.- Repeat steps 1 and 2 at least 5 times
+  1.- Shutdown your machine
+  2.- Boot your machine
+  3.- Repeat steps 1 and 2 at least 5 times
  .
  Note: This test case has to be executed manually before checkbox execution
 

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2011-09-29 09:15:40 +0000
+++ jobs/suspend.txt.in	2011-10-05 18:01:25 +0000
@@ -171,8 +171,8 @@
 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.
+  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.
 

=== modified file 'jobs/usb.txt.in'
--- jobs/usb.txt.in	2011-08-29 11:10:31 +0000
+++ jobs/usb.txt.in	2011-10-05 18:01:25 +0000
@@ -22,7 +22,7 @@
 requires: package.name == 'linux'
 command: keyboard_test
 _description:
- Plug a USB keyboard into the computer. Then, click on the Test button \
+ Plug a USB keyboard into the computer. Then, click on the Test button 
  to enter text.
  .
  Does the keyboard work?
@@ -33,8 +33,8 @@
 requires: package.name == 'linux'
 _description:
  USB mouse verification procedure:
- 1.- Plug a USB mouse into the computer
- 2.- Perform some single/double/right click operations
+  1.- Plug a USB mouse into the computer
+  2.- Perform some single/double/right click operations
  .
  Did all the steps work?
 
@@ -45,8 +45,8 @@
 command: watch_command -q -r 5 lsusb
 _description:
  Click 'Test' and insert a USB device within 5 seconds.
- If the test is successful, you should notice that 'Yes' is selected below.
- Do not unplug the device if the test is successful.
+  If the test is successful, you should notice that 'Yes' is selected below.
+  Do not unplug the device if the test is successful.
  .
  If no USB device is inserted or the device is not recognized, the test will fail and 'No' will be selected below.
 
@@ -57,7 +57,7 @@
 command: watch_command -q -r 5 lsusb
 _description:
  Click 'Test' and remove the USB device you inserted within 5 seconds.
- If the test is successful, you should notice that 'Yes' is selected below.
+  If the test is successful, you should notice that 'Yes' is selected below.
  .
  If the USB device isn't removed or the removal is not registered, the test will fail and 'No' will be selected below.
 
@@ -67,9 +67,9 @@
 command: usb_test -t
 _description:
  USB HDD verification procedure:
- 1.- Plug a USB HDD or thumbdrive into the computer
- 2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
- 3.- Click Test to begin
+  1.- Plug a USB HDD or thumbdrive into the computer
+  2.- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
+  3.- Click Test to begin
  .
  If the test is successful, you should see the Yes radio button marked.
 
@@ -84,10 +84,10 @@
 name: usb/panels
 requires: package.name == 'linux'
 _description:
- Connect a USB storage device to an external USB slot on this computer. \
- An icon should appear on the desktop and in the "Places" menu at the top of the screen.
+ Connect a USB storage device to an external USB slot on this computer. 
+  An icon should appear on the desktop and in the "Places" menu at the top of the screen.
  .
- Confirm that the icon appears, then eject the device. Repeat with each external \
+ Confirm that the icon appears, then eject the device. Repeat with each external 
  USB slot.
  .
  Do all USB slots work with the device?

=== modified file 'jobs/wireless.txt.in'
--- jobs/wireless.txt.in	2011-08-30 09:33:13 +0000
+++ jobs/wireless.txt.in	2011-10-05 18:01:25 +0000
@@ -11,10 +11,10 @@
 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
+  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?