Merge lp:~bladernr/checkbox/1103647-lsmod_info-chokes-on-nvidia into lp:checkbox

[Jeff Lane ]

For some reason, we were trapping OSError instead of CalledProcessError when calling check_output(). This results in a traceback when running lsmod_info on a system with the nVidia proprietary driver installed.

So, to remedy this, we now trap CalledProcessError instead. If this is hit, if the retcode is 1, it's most likely due to a module not returning info:

$ modinfo nvidia
ERROR: Module nvidia not found.

If it's anything else, we raise the error because it's something more insidious that needs to be looked at.

[Zygmunt Krynicki (zyga)]

34 + raise e

Inside a exception capture block you can just use 'raise' to re-raise whatever is being currently captured

review: Approve

[Daniel Manrique (roadmr)]

The attempt to merge lp:~bladernr/checkbox/1103647-lsmod_info-chokes-on-nvidia 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/5628458/
[precise] stderr: http://paste.ubuntu.com/5628459/
[precise] NOTE: unable to execute tests, marked as failed
[quantal] Bringing VM 'up'
[quantal] Unable to 'up' VM!
[quantal] stdout: http://paste.ubuntu.com/5628460/
[quantal] stderr: http://paste.ubuntu.com/5628461/
[quantal] NOTE: unable to execute tests, marked as failed
[raring] Bringing VM 'up'
[raring] Unable to 'up' VM!
[raring] stdout: http://paste.ubuntu.com/5628462/
[raring] stderr: http://paste.ubuntu.com/5628463/
[raring] NOTE: unable to execute tests, marked as failed

[Zygmunt Krynicki (zyga)]

Tarmac ran out of space, we should check why that could have happened later.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-01 18:21:01 +0000
+++ debian/changelog	2013-05-02 22:39:29 +0000
@@ -8,6 +8,8 @@
     (LP: #970857)
   * scripts/cpu_topology: define the cpuinfo nested dicts on creation rather
     than define elements during parsing of /proc/cpuinfo (LP: #1111878)
+  * scripts/lsmod_info: Corrected error handling for the check_output() call to
+    trap the correct error. (LP: #1103647)
 
   [ Sylvain Pineau ]
   * jobs/suspend.txt.in, scripts/gpu_test: Remove the need of running the script

=== modified file 'scripts/lsmod_info'
--- scripts/lsmod_info	2012-10-26 19:57:00 +0000
+++ scripts/lsmod_info	2013-05-02 22:39:29 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys
 from checkbox.parsers.modinfo import ModinfoParser
-from subprocess import Popen, PIPE, check_output
+from subprocess import Popen, PIPE, check_output, CalledProcessError
 
 
 def main():
@@ -19,8 +19,11 @@
             stream = check_output([cmd, module],
                                   stderr=PIPE,
                                   universal_newlines=False)
-        except OSError:
-            version = 'Unavailable'
+        except CalledProcessError as e:
+            if e.returncode != 1:
+                raise e
+            else:
+                version = 'Unavailable'
 
         stream = stream.decode('utf-8')