Merge lp:~cypressyew/checkbox-legacy/gpu_test_fix1321995 into lp:checkbox-legacy

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Daniel Manrique
Approved revision: 2821
Merged at revision: 2826
Proposed branch: lp:~cypressyew/checkbox-legacy/gpu_test_fix1321995
Merge into: lp:checkbox-legacy
Diff against target: 32 lines (+6/-5)
2 files modified
checkbox-old/CHANGELOG (+2/-0)
checkbox-old/scripts/gpu_test (+4/-5)
To merge this branch: bzr merge lp:~cypressyew/checkbox-legacy/gpu_test_fix1321995
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Zygmunt Krynicki (community) Approve
Review via email: mp+220567@code.launchpad.net

Description of the change

Parse the kernel output message from dmesg instead of the kern.log.
To make sure this GPU hung issue is happened during this session.

Changes made to checkbox-legacy since this issue would cause false-positive result on SRU systems.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

+1

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

The attempt to merge lp:~cypressyew/checkbox-legacy/gpu_test_fix1321995 into lp:checkbox-legacy failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Unable to 'up' VM!
[precise] stdout: http://paste.ubuntu.com/8459982/
[precise] stderr: http://paste.ubuntu.com/8459983/
[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...
[precise] Running cleanup tasks for 'shell' provisioner...
[precise] Running cleanup tasks for 'shell' provisioner...
[trusty] Bringing VM 'up'
[trusty] Unable to 'up' VM!
[trusty] stdout: http://paste.ubuntu.com/8460032/
[trusty] stderr: http://paste.ubuntu.com/8460033/
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Destroying failed VM to reclaim resources
[trusty] Forcing shutdown of VM...
[trusty] Destroying VM and associated drives...
[trusty] Running cleanup tasks for 'shell' provisioner...
[trusty] Running cleanup tasks for 'shell' provisioner...

Revision history for this message
Daniel Manrique (roadmr) wrote :

Reapproving to merge now that I fixed tarmac to use lxc for checkbox-legacy

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-old/CHANGELOG'
2--- checkbox-old/CHANGELOG 2014-03-19 19:59:28 +0000
3+++ checkbox-old/CHANGELOG 2014-05-22 06:17:51 +0000
4@@ -11,6 +11,8 @@
5 * Move the volume key test to right after the mute key test.
6 * scripts/graphics_driver: added a new pattern for parsing Intel driver on
7 12.04.4 (LP: #1279222)
8+ * scripts/gpu_test: parse the "gpu hung" pattern from dmesg instead of the
9+ kern.log (LP: #1321995)
10
11 [ Jeff Lane ]
12 * scripts/network: fail threshold for iperf is now an option and defaults to
13
14=== modified file 'checkbox-old/scripts/gpu_test'
15--- checkbox-old/scripts/gpu_test 2013-10-09 15:50:42 +0000
16+++ checkbox-old/scripts/gpu_test 2014-05-22 06:17:51 +0000
17@@ -140,11 +140,10 @@
18
19 def check_gpu(log=None):
20 if not log:
21- log = '/var/log/kern.log'
22- with open(log, 'rb') as f:
23- if re.findall(r'gpu\s+hung', str(f.read()), flags=re.I):
24- print("GPU hung Detected")
25- return 1
26+ log = subprocess.check_output(['dmesg'], universal_newlines=True)
27+ if re.findall(r'gpu\s+hung', log, flags=re.I):
28+ print("GPU hung Detected")
29+ return 1
30
31
32 def main():

Subscribers

People subscribed via source and target branches

to all changes: