Merge lp:~bladernr/checkbox/868643 into lp:checkbox

[Jeff Lane ]

Removed the unnecessary optical/dvd_movie_playbak job from optical.txt.in

[Marc Tardif (cr3)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-19 14:35:12 +0000
+++ debian/changelog	2012-09-19 16:52:23 +0000
@@ -22,6 +22,8 @@
     connections. This is necessary for adequate QA testing (LP: #1042425)
   * scripts/graphics_driver: fixed a bug causing the hybrid check to throw an
     exception on hybrid systems (LP: #1048058)
+  * jobs/optical.txt.in: removed the optical/dvd_movie_playback job definition
+    as it was redundant (LP: #868643)
 
   [Daniel Manrique]
   * Bumped to 0.14.6 to keep changelog size sane and fix a small mishap in the
@@ -114,7 +116,11 @@
     the 'device' argument (bus type) and require at least one value
   * [FEATURE] scripts/removable_storage_watcher: add support for debugging
 
+<<<<<<< TREE
  -- Jeff Lane <[e-mail]>  Wed, 19 Sep 2012 10:33:17 -0400
+=======
+ -- Jeff Lane <[e-mail]>  Wed, 19 Sep 2012 11:05:30 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.14.5) quantal; urgency=low
 

=== modified file 'jobs/optical.txt.in'
--- jobs/optical.txt.in	2012-08-07 20:22:18 +0000
+++ jobs/optical.txt.in	2012-09-19 16:52:23 +0000
@@ -106,21 +106,6 @@
  This is an automated version of optical/dvd-write. It assumes you inserted a blank DVD-R or DVD+R before starting testing. You must watch for the tray opening. The test will attempt to close the tray and continue testing, however this is not possible in all optical drives, thus you may need to push the tray or disk back in manually to continue the test.  This test has a 5 minute timeout to allow for the tester to catch this.
 
 plugin: manual
-name: optical/dvd_movie_playback
-depends: optical/read
-_description:
- PURPOSE:
-     This test will check your DVD movie playback capabilities. Note that installation of non-free software (codecs, player, etc) may be required prior to performing this test.
- STEPS:
-     1. Insert a DVD that contains any movie in your optical drive
-     2. Open the Dash (click on the Ubuntu Circle of Friends button on the Launcher)
-     3. Click "Media Apps" and then click on "Movie Player"
-     4. Play the movie using Movie Player, stop the movie after verifying that it plays
-     6. Eject the DVD
- VERIFICATION:
-     Did all the steps work?
-
-plugin: manual
 name: optical/dvd_playback
 command: totem /media/cdrom
 requires: