Rev 4180: Merge lifeless into make-it-work in file:///home/vila/src/bzr/experimental/parallel-selftest/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Mar 23 08:44:10 GMT 2009
At file:///home/vila/src/bzr/experimental/parallel-selftest/
------------------------------------------------------------
revno: 4180
revision-id: v.ladeuil+lp at free.fr-20090323084408-w9kfz2ynw1yko5p1
parent: v.ladeuil+lp at free.fr-20090322174759-lqlzz62sj65clpt8
parent: v.ladeuil+lp at free.fr-20090323084355-fp31zegykjbsep3v
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: make-it-work
timestamp: Mon 2009-03-23 09:44:08 +0100
message:
Merge lifeless into make-it-work
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 4169.1.7
revision-id: v.ladeuil+lp at free.fr-20090323084355-fp31zegykjbsep3v
parent: v.ladeuil+lp at free.fr-20090322174351-r28gl68v332a42dm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: lifeless
timestamp: Mon 2009-03-23 09:43:55 +0100
message:
Fix obvious typos.
* bzrlib/tests/__init__.py:
(local_concurrency): Fix typo in mode.
(cpucount): We got the content, use it.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2009-03-22 17:47:59 +0000
+++ b/bzrlib/tests/__init__.py 2009-03-23 08:44:08 +0000
@@ -3002,7 +3002,7 @@
def cpucount(content):
lines = content.splitlines()
prefix = 'processor'
- for line in file('/proc/cpuinfo', 'rb').readlines():
+ for line in lines:
if line.startswith(prefix):
concurrency = int(line[line.find(':')+1:-1]) + 1
return concurrency
@@ -3010,7 +3010,7 @@
def local_concurrency():
try:
- content = file('/proc/cpuinfo', rb).read()
+ content = file('/proc/cpuinfo', 'rb').read()
concurrency = cpucount(content)
except Exception, e:
concurrency = 1
More information about the bazaar-commits
mailing list