Merge lp:~bladernr/checkbox/1564595-cpuinfo_parser-s390x into lp:checkbox

[Jeff Lane ]

Modified the cpuinfo parser to properly count s390x processors

[Sylvain Pineau (sylvain-pineau)]

+1, indeed s390x cpuinfo differs as follow:

 cat /proc/cpuinfo
 vendor_id : IBM/S390
 # processors : 2
 bogomips per cpu: 6396.31
 features : <some features>
 processor 0: version = FF, identification = <some id>, machine = 2827
 processor 1: version = FF, identification = <some other id>, machine = 2827

review: Approve

[Sylvain Pineau (sylvain-pineau)]

The attempt to merge lp:~bladernr/checkbox/1564595-cpuinfo_parser-s390x into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.11user 0.07system 0:05.37elapsed 3%CPU (0avgtext+0avgdata 10252maxresident)k
[precise] (timing) 0inputs+32outputs (0major+8795minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 50.26user 20.61system 1:17.89elapsed 91%CPU (0avgtext+0avgdata 96088maxresident)k
[precise] (timing) 0inputs+19120outputs (0major+3200477minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.69user 0.19system 0:00.92elapsed 96%CPU (0avgtext+0avgdata 48356maxresident)k
[precise-testing] (timing) 0inputs+1384outputs (0major+22589minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: FAIL
[precise-testing] stdout: http://paste.ubuntu.com/15574749/
[precise-testing] stderr: http://paste.ubuntu.com/15574750/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 32.87user 0.40system 0:33.32elapsed 99%CPU (0avgtext+0avgdata 150816maxresident)k
[precise-testing] (timing) 0inputs+1336outputs (0major+41304minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.00user 0.02system 0:00.02elapsed 75%CPU (0avgtext+0avgdata 2180maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2375minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 1.07user 0.13system 0:01.23elapsed 98%CPU (0avgtext+0avgdata 46456maxresident)k
[precise-testing] (timing) 0inputs+64outputs (0major+14263minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.35user 0.07system 0:00.44elapsed 97%CPU (0avgtext+0avgdata 20256maxresident)k
[precise-testing] (timing) 0inputs+96outputs (0major+11877minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: FAIL
[precise-testing] stdout: http://paste.ubuntu.com/15574756/
[precise-testing] stderr: http://paste.ubuntu.com/15574757/
[precise-testing] (timing) Command exited with non-zero status 1
[precise-testing] (timing) 28.45user 0.89system 0:29.48elapsed 99%CPU (0avgtext+0avgdata 200044maxresident)k
[precise-testing] (timing) 0inputs+3288outputs (0major+96430minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: FAIL...

[Sylvain Pineau (sylvain-pineau)]

Jeff, there's a small typo '#processors", please use single quotes on both sides ;)

review: Needs Fixing

[lp:~bladernr/checkbox/1564595-cpuinfo_parser-s390x]

4292. By Jeff Lane  on 2016-04-04

Fixed typo (mixed quotes)

[Jeff Lane  (bladernr)]

Whoops... fixed. Thanks.

review: Needs Resubmitting

[Paul Larson (pwlars)]

Looks better, thanks!

review: Approve

=== modified file 'checkbox-support/checkbox_support/parsers/cpuinfo.py'
--- checkbox-support/checkbox_support/parsers/cpuinfo.py	2014-11-07 18:07:53 +0000
+++ checkbox-support/checkbox_support/parsers/cpuinfo.py	2016-04-04 18:40:47 +0000
@@ -48,8 +48,10 @@
                     continue
                 key, value = line.split(":", 1)
                 key, value = key.strip(), value.strip()
-
-                if key == 'processor':
+                # lp:1564595 - cpuinfo is different for s390x
+                if key == '#processors':
+                    count += int(value)
+                elif key == 'processor':
                     count += 1
 
                 # Handle bogomips on sparc