Merge lp:~javier.collado/checkbox/bug888447 into lp:checkbox

[Javier Collado]

This branch fixes the broken dependencies described in bug888447

It also adds a checkbox-editor configuration file, so that checkbox-editor can be used to verify that dependencies are now fixed.

[Brendan Donegan (brendan-donegan)]

Hey Javier,

Thanks for this! Merging.

review: Approve

=== added file '.checkbox-editor.cfg'
--- .checkbox-editor.cfg	1970-01-01 00:00:00 +0000
+++ .checkbox-editor.cfg	2011-11-10 09:09:30 +0000
@@ -0,0 +1,18 @@
+[environment]
+checkbox_share = .
+
+[version control]
+push_branch = lp:checkbox
+pull_branch = lp:checkbox
+push_on_close = False
+commit_on_save = False
+pull_on_open = False
+exclude = .checkbox-editor.cfg
+
+[general]
+checkbox_data_cleanup = True
+replace_tabs_with_spaces = True
+number_of_spaces = 4
+checkbox_binary = ./bin/checkbox-gtk
+whitelist_resources = True
+

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-09 20:00:45 +0000
+++ debian/changelog	2011-11-10 09:09:30 +0000
@@ -1,5 +1,6 @@
 checkbox (0.13) precise; urgency=low
 
+  [ Daniel Manrique ]
   [Marc Tardif]
   * Generate a submission.xml file that contains all device and attachment
     information, suitable for offline processing and submission.
@@ -36,7 +37,10 @@
      BLUETOOTH to run, thus preventing the test from failing on systems with
      no Bluetooth device (LP: #862322)
 
- -- Daniel Manrique <[e-mail]>  Fri, 04 Nov 2011 16:32:08 -0400
+  [ Javier Collado ]
+  * Broken job dependencies fixed (LP: #888447)
+
+ -- Javier Collado <[e-mail]>  Thu, 10 Nov 2011 10:05:04 +0100
 
 checkbox (0.12.8) oneiric; urgency=low
 

=== modified file 'jobs/graphics.txt.in'
--- jobs/graphics.txt.in	2011-10-07 18:59:33 +0000
+++ jobs/graphics.txt.in	2011-11-10 09:09:30 +0000
@@ -124,7 +124,7 @@
 plugin: manual
 name: graphics/cycle_resolution
 requires: package.name == 'xorg'
-depends: xrandr_detect_modes
+depends: graphics/xrandr_detect_modes
 command: xrandr_cycle
 _description:
  PURPOSE:

=== modified file 'jobs/info.txt.in'
--- jobs/info.txt.in	2011-10-14 10:30:52 +0000
+++ jobs/info.txt.in	2011-11-10 09:09:30 +0000
@@ -86,13 +86,13 @@
 
 plugin: attachment
 name: info/screenshot.png
-depends: screenshot
+depends: info/screenshot
 command: cat ${CHECKBOX_DATA}/screenshot.png
 _description: Attaches the screenshot captured in info/screenshot.
 
 plugin: attachment
 name: info/fwts_log
-depends: fwts_test
+depends: miscellanea/fwts_test
 _description: Gather log from the Firmware Test Suite run.
 command:
  cat $CHECKBOX_DATA/fwts_results.log

=== modified file 'jobs/peripheral.txt.in'
--- jobs/peripheral.txt.in	2011-10-07 18:59:33 +0000
+++ jobs/peripheral.txt.in	2011-11-10 09:09:30 +0000
@@ -32,7 +32,7 @@
 
 plugin: shell
 name: peripheral/external-usb-modem-http
-depends: external-usb-modem
+depends: peripheral/external-usb-modem
 command: wget -SO /dev/null http://$TRANSFER_SERVER
 _description:
  Automated test case to make sure that it's possible to download files through HTTP

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2011-10-07 18:59:33 +0000
+++ jobs/suspend.txt.in	2011-11-10 09:09:30 +0000
@@ -28,7 +28,7 @@
 
 plugin: shell
 name: suspend/wireless_before_suspend
-depends: networking/wireless_connection
+depends: wireless/wireless_connection
 command: nmcli -t -f UUID con status > $CHECKBOX_DATA/connections && connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
 _description:
  This test disconnects all connections and then connects to the wireless
@@ -56,7 +56,7 @@
 
 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
+depends: power-management/rtc networking/detect suspend/resolution_before_suspend suspend/wireless_before_suspend bluetooth/detect-output suspend/cpu_before_suspend suspend/memory_before_suspend
 requires: package.name == 'pm-utils'
 user: root
 command: sleep_test -d

=== modified file 'jobs/user_apps.txt.in'
--- jobs/user_apps.txt.in	2011-10-07 18:59:33 +0000
+++ jobs/user_apps.txt.in	2011-11-10 09:09:30 +0000
@@ -1,6 +1,6 @@
 plugin: manual
 name: software/update_manager_finds_updates
-depends: internet_test
+depends: networking/detect
 user: root
 requires: package.name == 'update-manager'
 _description: