Merge lp:~roadmr/checkbox/1215778-storage-test-gpt into lp:checkbox

[Daniel Manrique]

A simple fix for the attached bug, parted stops to ask for information on GPT disks, which causes the storage_test to stall, this simply uses the -s (script) parameter to parted to avoid any interaction.

A simple fix for the attached bug, parted stops to ask for information on GPT disks, which causes the storage_test to stall, this simply uses the -s (script) parameter to parted to avoid any interaction.

[Jeff Lane  (bladernr)]

Thanks for getting this one in so quickly.

review: Approve

[Daniel Manrique (roadmr)]

The attempt to merge lp:~roadmr/checkbox/1215778-storage-test-gpt into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Unable to 'up' VM!
[precise] stdout: http://paste.ubuntu.com/6037058/
[precise] stderr: http://paste.ubuntu.com/6037059/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed VM to reclaim resources
[precise] Forcing shutdown of VM...
[precise] Destroying VM and associated drives...
[quantal] Bringing VM 'up'
[quantal] (timing) 7.92user 3.35system 2:44.01elapsed 6%CPU (0avgtext+0avgdata 21312maxresident)k
[quantal] (timing) 0inputs+136outputs (0major+216805minor)pagefaults 0swaps
[quantal] Starting tests...
[quantal] CheckBox test suite: PASS
[quantal] (timing) 0.82user 0.29system 0:40.61elapsed 2%CPU (0avgtext+0avgdata 19892maxresident)k
[quantal] (timing) 0inputs+40outputs (0major+47441minor)pagefaults 0swaps
[quantal] (timing) 0.80user 0.24system 0:06.82elapsed 15%CPU (0avgtext+0avgdata 20372maxresident)k
[quantal] (timing) 0inputs+16outputs (0major+47301minor)pagefaults 0swaps
[quantal] PlainBox test suite: PASS
[quantal] (timing) 1.03user 0.31system 0:21.17elapsed 6%CPU (0avgtext+0avgdata 19716maxresident)k
[quantal] (timing) 0inputs+216outputs (0major+47255minor)pagefaults 0swaps
[quantal] PlainBox documentation build: PASS
[quantal] (timing) 0.87user 0.22system 0:25.67elapsed 4%CPU (0avgtext+0avgdata 19936maxresident)k
[quantal] (timing) 0inputs+24outputs (0major+47351minor)pagefaults 0swaps
[quantal] CheckBoxNG test suite: PASS
[quantal] (timing) 0.79user 0.27system 0:09.62elapsed 11%CPU (0avgtext+0avgdata 20016maxresident)k
[quantal] (timing) 0inputs+16outputs (0major+47293minor)pagefaults 0swaps
[quantal] Integration tests: PASS
[quantal] (timing) 0.78user 0.31system 0:10.28elapsed 10%CPU (0avgtext+0avgdata 19704maxresident)k
[quantal] (timing) 0inputs+8outputs (0major+47295minor)pagefaults 0swaps
[quantal] Destroying VM
[raring] Bringing VM 'up'
[raring] (timing) 7.84user 3.60system 2:28.23elapsed 7%CPU (0avgtext+0avgdata 21452maxresident)k
[raring] (timing) 0inputs+112outputs (0major+203433minor)pagefaults 0swaps
[raring] Starting tests...
[raring] CheckBox test suite: PASS
[raring] (timing) 0.79user 0.28system 0:38.28elapsed 2%CPU (0avgtext+0avgdata 20844maxresident)k
[raring] (timing) 0inputs+40outputs (0major+47403minor)pagefaults 0swaps
[raring] (timing) 0.79user 0.33system 0:06.95elapsed 16%CPU (0avgtext+0avgdata 20220maxresident)k
[raring] (timing) 0inputs+16outputs (0major+47117minor)pagefaults 0swaps
[raring] PlainBox test suite: PASS
[raring] (timing) 1.00user 0.26system 0:16.99elapsed 7%CPU (0avgtext+0avgdata 20656maxresident)k
[raring] (timing) 0inputs+216outputs (0major+47565minor)pagefaults 0swaps
[raring] PlainBox documentation build: PASS
[raring] (timing) 0.73user 0.31system 0:13.69elapsed 7%CPU (0avgtext+0avgdata 20152maxresident)k
[raring] (timing) 0inputs+16outputs (0major+48498minor)pagefaults 0swaps
[raring] CheckBoxNG test suite: PASS
[raring] (timing) 0.79user 0.24system 0:06.77elapse...

[Daniel Manrique (roadmr)]

Reapproving due to tarmac fail.

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-08-27 19:03:15 +0000
+++ checkbox-old/debian/changelog	2013-08-28 15:36:41 +0000
@@ -4,6 +4,10 @@
   * scripts/memory_compare: output now displays kB properly, not bytes labled
   * as kB. (LP: #1217506)
 
+  [ Daniel Manrique ]
+  * scripts/storage_test: Use parted silent mode to avoid hanging on disks
+    with GPT (LP: #1215778)
+
  -- Brendan Donegan <[e-mail]>  Fri, 23 Aug 2013 14:22:13 +0100
 
 checkbox (0.16.9) saucy; urgency=low

=== modified file 'checkbox-old/scripts/storage_test'
--- checkbox-old/scripts/storage_test	2013-05-29 07:50:30 +0000
+++ checkbox-old/scripts/storage_test	2013-08-28 15:36:41 +0000
@@ -17,7 +17,7 @@
 if [ -b $disk ]
 then
     echo "$disk is a block device"
-    size=`parted -l | grep $disk | awk '{print $3}'`
+    size=`parted -l -s | grep $disk | awk '{print $3}'`
 
     if [ -n "$size" ]
     then