openstack/deb-python-testtools
Code Issues Proposed changes

Merge branch 'master' of github.com:jml/testtools into git-not-bzr

Browse Source 
Conflicts:
	MANIFEST.in
This commit is contained in:
Jonathan Lange
2013-01-31 12:55:29 +00:00
parent eb263830b0 959d3817ba
commit 435f56b07c
8 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@@ -2,7 +2,7 @@ include LICENSE
include Makefile include Makefile
include MANIFEST.in include MANIFEST.in
include NEWS include NEWS
include README include README.rst
include .gitignore include .gitignore
graft doc graft doc
graft doc/_static graft doc/_static

2
Makefile
View File

@@ -1,4 +1,4 @@
# See README for copyright and licensing details. # Copyright (c) 2008-2013 testtools developers. See LICENSE for details.
PYTHON=python PYTHON=python
SOURCES=$(shell find testtools -name "*.py") SOURCES=$(shell find testtools -name "*.py")

2
NEWS
View File

@@ -260,7 +260,7 @@ Improvements
* API documentation corrections. (Raphaël Badin) * API documentation corrections. (Raphaël Badin)
* ``ConcurrentTestSuite`` now takes an optional ``wrap_result`` parameter * ``ConcurrentTestSuite`` now takes an optional ``wrap_result`` parameter
that can be used to wrap the ``ThreadsafeForwardingResult``s created by that can be used to wrap the ``ThreadsafeForwardingResults`` created by
the suite. (Jonathan Lange) the suite. (Jonathan Lange)
* ``Tagger`` added. It's a new ``TestResult`` that tags all tests sent to * ``Tagger`` added. It's a new ``TestResult`` that tags all tests sent to

0
README → README.rst
View File

6
doc/for-test-authors.rst
View File

@@ -524,10 +524,14 @@ file against an arbitrary matcher::
HasLength HasLength
~~~~~~~~~ ~~~~~~~~~
Check the length of a collection. For example:: Check the length of a collection. The following assertion will fail::
self.assertThat([1, 2, 3], HasLength(2)) self.assertThat([1, 2, 3], HasLength(2))
But this one won't::
self.assertThat([1, 2, 3], HasLength(3))
HasPermissions HasPermissions
~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~

2
doc/hacking.rst
View File

@@ -63,7 +63,7 @@ Source layout
------------- -------------
The top-level directory contains the ``testtools/`` package directory, and The top-level directory contains the ``testtools/`` package directory, and
miscellaneous files like ``README`` and ``setup.py``. miscellaneous files like ``README.rst`` and ``setup.py``.
The ``testtools/`` directory is the Python package itself. It is separated The ``testtools/`` directory is the Python package itself. It is separated
into submodules for internal clarity, but all public APIs should be “promoted” into submodules for internal clarity, but all public APIs should be “promoted”

10
testtools/matchers/_higherorder.py
View File

@@ -298,6 +298,7 @@ def MatchesPredicateWithParams(predicate, message, name=None):
HasLength = MatchesPredicate( HasLength = MatchesPredicate(
lambda x, y: len(x) == y, 'len({0}) is not {1}') lambda x, y: len(x) == y, 'len({0}) is not {1}')
# This assertion will fail, as 'len([1, 2]) == 3' is False.
self.assertThat([1, 2], HasLength(3)) self.assertThat([1, 2], HasLength(3))
Note that unlike MatchesPredicate MatchesPredicateWithParams returns a Note that unlike MatchesPredicate MatchesPredicateWithParams returns a
@@ -325,12 +326,13 @@ class _MatchesPredicateWithParams(Matcher):
"""Create a ``MatchesPredicateWithParams`` matcher. """Create a ``MatchesPredicateWithParams`` matcher.
:param predicate: A function that takes an object to match and :param predicate: A function that takes an object to match and
additional params as given in *args and **kwargs. The result of the additional params as given in ``*args`` and ``**kwargs``. The
function will be interpreted as a boolean to determine a match. result of the function will be interpreted as a boolean to
determine a match.
:param message: A message to describe a mismatch. It will be formatted :param message: A message to describe a mismatch. It will be formatted
with .format() and be given a tuple containing whatever was passed with .format() and be given a tuple containing whatever was passed
to ``match()`` + *args in *args, and whatever was passed to to ``match()`` + ``*args`` in ``*args``, and whatever was passed to
**kwargs as its **kwargs. ``**kwargs`` as its ``**kwargs``.
For instance, to format a single parameter:: For instance, to format a single parameter::

3
testtools/tests/__init__.py
View File

@@ -1,6 +1,7 @@
# Copyright (c) 2008-2013 testtools developers. See LICENSE for details.
"""Tests for testtools itself.""" """Tests for testtools itself."""
# See README for copyright and licensing details.
from unittest import TestSuite from unittest import TestSuite