Merge lp:~cr3/checkbox/optical_write_test into lp:checkbox

[Marc Tardif]

This doesn't deserve a changelog entry because it is only to fix this merge request that should not have been merged:

  https://code.launchpad.net/~sylvain-pineau/checkbox/bug1052803/+merge/125796

[Sylvain Pineau (sylvain-pineau)]

If the script is intended to be only use with checkbox, I would say ok, but what if a tester decides to copy it to his/her $HOME ? And just optical_writer, not ansi_parser.

review: Needs Information

[Marc Tardif (cr3)]

Can't find the button in Launchpad to supersede this branch by:

https://code.launchpad.net/~sylvain-pineau/checkbox/bug1052803/+merge/125952

So, setting this branch as disapprove instead. Ugh...

review: Disapprove

Unmerged revisions

1699. By Marc Tardif on 2012-09-23

Fixed hard coded path to /usr/share/checkbox/scripts.

=== modified file 'scripts/optical_write_test'
--- scripts/optical_write_test	2012-09-21 20:09:56 +0000
+++ scripts/optical_write_test	2012-09-23 16:29:20 +0000
@@ -5,6 +5,7 @@
 SAMPLE_FILE_PATH='/usr/share/example-content/'
 SAMPLE_FILE='Ubuntu_Free_Culture_Showcase'
 MD5SUM_FILE='optical_test.md5'
+SCRIPTS_DIR=`dirname $0`
 START_DIR=$PWD
 
 create_working_dirs(){
@@ -53,7 +54,7 @@
     echo "Sleeping 10 seconds in case drive is not yet ready ..."
     sleep 10
     echo "Beginning image burn ..."
-    wodim -eject dev=$OPTICAL_DRIVE $ISO_NAME | /usr/share/checkbox/scripts/ansi_parser
+    wodim -eject dev=$OPTICAL_DRIVE $ISO_NAME | $SCRIPTS_DIR/ansi_parser
     rt=$?
     return $rt
 }