Mercurial > bitten > bitten-test
changeset 722:2024b148aed7 0.6.x
Merge [797:799] from trunk.
author | osimons |
---|---|
date | Wed, 09 Dec 2009 11:57:42 +0000 |
parents | 4d85133f6c23 |
children | fcab3b625fb1 |
files | bitten/__init__.py bitten/build/pythontools.py bitten/slave.py doc/configure.txt |
diffstat | 4 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/__init__.py +++ b/bitten/__init__.py @@ -19,4 +19,4 @@ pass # The master-slave protocol/configuration version -PROTOCOL_VERSION = 2 +PROTOCOL_VERSION = 3
--- a/bitten/build/pythontools.py +++ b/bitten/build/pythontools.py @@ -399,6 +399,8 @@ modname = base.replace(os.path.sep, '.') realfilename = ctxt.resolve(filename) interesting_lines = get_lines(open(realfilename)) + if not interesting_lines: + continue covered_lines = coverage_data.get(realfilename, set()) percentage = int(round(len(covered_lines) * 100 / len(interesting_lines))) line_hits = []
--- a/bitten/slave.py +++ b/bitten/slave.py @@ -169,9 +169,8 @@ ).startswith('text/plain'): content = e.read() else: - content = 'no message available' - log.debug('Server returned error %d: %s (%s)', - e.code, e.msg, content) + content = 'Unknown cause of error' + e.msg = '%s (%s)' % (e.msg, content) raise return e
--- a/doc/configure.txt +++ b/doc/configure.txt @@ -40,6 +40,8 @@ :`version`: The operating system version. :`machine`: The hardware platform (for example “i686” or “Power Macintosh”). :`processor`: The processor architecture (for example “athlon” or “powerpc”). +:`name`: The name of the slave. +:`ipnr`: The IP address of the slave. Note that not all of these properties may be available for all platforms, depending on OS and Python version.