Update py-testtools to 0.9.24.

0.9.24
~~~~~~

Changes
-------

* ``testtools.run discover`` will now sort the tests it discovered. This is a
  workaround for http://bugs.python.org/issue16709. Non-standard test suites
  are preserved, and their ``sort_tests()`` method called (if they have such an
  attribute). ``testtools.testsuite.sorted_tests(suite, True)`` can be used by
  such suites to do a local sort. (Robert Collins, #1091512)

* ``ThreadsafeForwardingResult`` now defines a stub ``progress`` method, which
  fixes ``testr run`` of streams containing progress markers (by discarding the
  progress data). (Robert Collins, #1019165)

0.9.23
~~~~~~

Changes
-------

* ``run.TestToolsTestRunner`` now accepts the verbosity, buffer and failfast
  arguments the upstream python TestProgram code wants to give it, making it
  possible to support them in a compatible fashion. (Robert Collins)

Improvements
------------

* ``testtools.run`` now supports the ``-f`` or ``--failfast`` parameter.
  Previously it was advertised in the help but ignored.
  (Robert Collins, #1090582)

* ``AnyMatch`` added, a new matcher that matches when any item in a collection
  matches the given matcher.  (Jonathan Lange)

* Spelling corrections to documentation.  (Vincent Ladeuil)

* ``TestProgram`` now has a sane default for its ``testRunner`` argument.
  (Vincent Ladeuil)

* The test suite passes on Python 3 again. (Robert Collins)

0.9.22
~~~~~~

Improvements
------------

* ``content_from_file`` and ``content_from_stream`` now accept seek_offset and
  seek_whence parameters allowing them to be used to grab less than the full
  stream, or to be used with StringIO streams. (Robert Collins, #1088693)

0.9.21
~~~~~~

Improvements
------------

* ``DirContains`` correctly exposed, after being accidentally hidden in the
  great matcher re-organization of 0.9.17.  (Jonathan Lange)


0.9.20
~~~~~~

Three new matchers that'll rock your world.

Improvements
------------

* New, powerful matchers that match items in a dictionary:

  - ``MatchesDict``, match every key in a dictionary with a key in a
    dictionary of matchers.  For when the set of expected keys is equal to the
    set of observed keys.

  - ``ContainsDict``, every key in a dictionary of matchers must be
    found in a dictionary, and the values for those keys must match.  For when
    the set of expected keys is a subset of the set of observed keys.

  - ``ContainedByDict``, every key in a dictionary must be found in
    a dictionary of matchers.  For when the set of expected keys is a superset
    of the set of observed keys.

  The names are a little confusing, sorry.  We're still trying to figure out
  how to present the concept in the simplest way possible.


0.9.19
~~~~~~

How embarrassing!  Three releases in two days.

We've worked out the kinks and have confirmation from our downstreams that
this is all good.  Should be the last release for a little while.  Please
ignore 0.9.18 and 0.9.17.

Improvements
------------

* Include the matcher tests in the release, allowing the tests to run and
  pass from the release tarball.  (Jonathan Lange)

* Fix cosmetic test failures in Python 3.3, introduced during release 0.9.17.
  (Jonathan Lange)


0.9.18
~~~~~~

Due to an oversight, release 0.9.18 did not contain the new
``testtools.matchers`` package and was thus completely broken.  This release
corrects that, returning us all to normality.

0.9.17
~~~~~~

This release brings better discover support and Python3.x improvements. There
are still some test failures on Python3.3 but they are cosmetic - the library
is as usable there as on any other Python 3 release.

Changes
-------

* The ``testtools.matchers`` package has been split up.  No change to the
  public interface.  (Jonathan Lange)

Improvements
------------

* ``python -m testtools.run discover . --list`` now works. (Robert Collins)

* Correctly handling of bytes vs text in JSON content type. (Martin [gz])


0.9.16
~~~~~~

Some new matchers and a new content helper for JSON content.

This is the first release of testtools to drop support for Python 2.4 and 2.5.
If you need support for either of those versions, please use testtools 0.9.15.

Improvements
------------

* New content helper, ``json_content`` (Jonathan Lange)

* New matchers:

  * ``ContainsAll`` for asserting one thing is a subset of another
    (Raphaël Badin)

  * ``SameMembers`` for asserting two iterators have the same members.
    (Jonathan Lange)

* Reraising of exceptions in Python 3 is more reliable. (Martin [gz])

3 files changed, 69 insertions, 16 deletions

diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index 301f2323d05..a46ada59053 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2012/10/31 11:19:35 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/01/19 11:03:17 obache Exp $
 #
 
-DISTNAME=	testtools-0.9.15
+DISTNAME=	testtools-0.9.24
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/testtools/0.9/${PKGVERSION_NOREV}/+download/ \
-		http://launchpadlibrarian.net/104513821/
+		http://launchpadlibrarian.net/126150325/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://launchpad.net/testtools
@@ -14,5 +14,7 @@ LICENSE=	mit AND python-software-foundation
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_INCLUDE_3X=	yes
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-testtools/PLIST b/devel/py-testtools/PLIST
index a47b246a584..67f48896441 100644
--- a/devel/py-testtools/PLIST
+++ b/devel/py-testtools/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2012/09/16 12:37:51 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/01/19 11:03:17 obache Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/testtools/__init__.py
 ${PYSITELIB}/testtools/__init__.pyc
 ${PYSITELIB}/testtools/__init__.pyo
 ${PYSITELIB}/testtools/_compat2x.py
-${PYSITELIB}/testtools/_compat2x.pyc
-${PYSITELIB}/testtools/_compat2x.pyo
+${PLIST.py2x}${PYSITELIB}/testtools/_compat2x.pyc
+${PLIST.py2x}${PYSITELIB}/testtools/_compat2x.pyo
 ${PYSITELIB}/testtools/_compat3x.py
 ${PYSITELIB}/testtools/_compat3x.pyc
 ${PYSITELIB}/testtools/_compat3x.pyo
@@ -30,9 +30,33 @@ ${PYSITELIB}/testtools/distutilscmd.pyo
 ${PYSITELIB}/testtools/helpers.py
 ${PYSITELIB}/testtools/helpers.pyc
 ${PYSITELIB}/testtools/helpers.pyo
-${PYSITELIB}/testtools/matchers.py
-${PYSITELIB}/testtools/matchers.pyc
-${PYSITELIB}/testtools/matchers.pyo
+${PYSITELIB}/testtools/matchers/__init__.py
+${PYSITELIB}/testtools/matchers/__init__.pyc
+${PYSITELIB}/testtools/matchers/__init__.pyo
+${PYSITELIB}/testtools/matchers/_basic.py
+${PYSITELIB}/testtools/matchers/_basic.pyc
+${PYSITELIB}/testtools/matchers/_basic.pyo
+${PYSITELIB}/testtools/matchers/_datastructures.py
+${PYSITELIB}/testtools/matchers/_datastructures.pyc
+${PYSITELIB}/testtools/matchers/_datastructures.pyo
+${PYSITELIB}/testtools/matchers/_dict.py
+${PYSITELIB}/testtools/matchers/_dict.pyc
+${PYSITELIB}/testtools/matchers/_dict.pyo
+${PYSITELIB}/testtools/matchers/_doctest.py
+${PYSITELIB}/testtools/matchers/_doctest.pyc
+${PYSITELIB}/testtools/matchers/_doctest.pyo
+${PYSITELIB}/testtools/matchers/_exception.py
+${PYSITELIB}/testtools/matchers/_exception.pyc
+${PYSITELIB}/testtools/matchers/_exception.pyo
+${PYSITELIB}/testtools/matchers/_filesystem.py
+${PYSITELIB}/testtools/matchers/_filesystem.pyc
+${PYSITELIB}/testtools/matchers/_filesystem.pyo
+${PYSITELIB}/testtools/matchers/_higherorder.py
+${PYSITELIB}/testtools/matchers/_higherorder.pyc
+${PYSITELIB}/testtools/matchers/_higherorder.pyo
+${PYSITELIB}/testtools/matchers/_impl.py
+${PYSITELIB}/testtools/matchers/_impl.pyc
+${PYSITELIB}/testtools/matchers/_impl.pyo
 ${PYSITELIB}/testtools/monkey.py
 ${PYSITELIB}/testtools/monkey.pyc
 ${PYSITELIB}/testtools/monkey.pyo
@@ -63,6 +87,36 @@ ${PYSITELIB}/testtools/tests/__init__.pyo
 ${PYSITELIB}/testtools/tests/helpers.py
 ${PYSITELIB}/testtools/tests/helpers.pyc
 ${PYSITELIB}/testtools/tests/helpers.pyo
+${PYSITELIB}/testtools/tests/matchers/__init__.py
+${PYSITELIB}/testtools/tests/matchers/__init__.pyc
+${PYSITELIB}/testtools/tests/matchers/__init__.pyo
+${PYSITELIB}/testtools/tests/matchers/helpers.py
+${PYSITELIB}/testtools/tests/matchers/helpers.pyc
+${PYSITELIB}/testtools/tests/matchers/helpers.pyo
+${PYSITELIB}/testtools/tests/matchers/test_basic.py
+${PYSITELIB}/testtools/tests/matchers/test_basic.pyc
+${PYSITELIB}/testtools/tests/matchers/test_basic.pyo
+${PYSITELIB}/testtools/tests/matchers/test_datastructures.py
+${PYSITELIB}/testtools/tests/matchers/test_datastructures.pyc
+${PYSITELIB}/testtools/tests/matchers/test_datastructures.pyo
+${PYSITELIB}/testtools/tests/matchers/test_dict.py
+${PYSITELIB}/testtools/tests/matchers/test_dict.pyc
+${PYSITELIB}/testtools/tests/matchers/test_dict.pyo
+${PYSITELIB}/testtools/tests/matchers/test_doctest.py
+${PYSITELIB}/testtools/tests/matchers/test_doctest.pyc
+${PYSITELIB}/testtools/tests/matchers/test_doctest.pyo
+${PYSITELIB}/testtools/tests/matchers/test_exception.py
+${PYSITELIB}/testtools/tests/matchers/test_exception.pyc
+${PYSITELIB}/testtools/tests/matchers/test_exception.pyo
+${PYSITELIB}/testtools/tests/matchers/test_filesystem.py
+${PYSITELIB}/testtools/tests/matchers/test_filesystem.pyc
+${PYSITELIB}/testtools/tests/matchers/test_filesystem.pyo
+${PYSITELIB}/testtools/tests/matchers/test_higherorder.py
+${PYSITELIB}/testtools/tests/matchers/test_higherorder.pyc
+${PYSITELIB}/testtools/tests/matchers/test_higherorder.pyo
+${PYSITELIB}/testtools/tests/matchers/test_impl.py
+${PYSITELIB}/testtools/tests/matchers/test_impl.pyc
+${PYSITELIB}/testtools/tests/matchers/test_impl.pyo
 ${PYSITELIB}/testtools/tests/test_compat.py
 ${PYSITELIB}/testtools/tests/test_compat.pyc
 ${PYSITELIB}/testtools/tests/test_compat.pyo
@@ -84,9 +138,6 @@ ${PYSITELIB}/testtools/tests/test_fixturesupport.pyo
 ${PYSITELIB}/testtools/tests/test_helpers.py
 ${PYSITELIB}/testtools/tests/test_helpers.pyc
 ${PYSITELIB}/testtools/tests/test_helpers.pyo
-${PYSITELIB}/testtools/tests/test_matchers.py
-${PYSITELIB}/testtools/tests/test_matchers.pyc
-${PYSITELIB}/testtools/tests/test_matchers.pyo
 ${PYSITELIB}/testtools/tests/test_monkey.py
 ${PYSITELIB}/testtools/tests/test_monkey.pyc
 ${PYSITELIB}/testtools/tests/test_monkey.pyo
diff --git a/devel/py-testtools/distinfo b/devel/py-testtools/distinfo
index 67955d88a6b..2cb6a52748e 100644
--- a/devel/py-testtools/distinfo
+++ b/devel/py-testtools/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/09/16 12:37:51 obache Exp $
+$NetBSD: distinfo,v 1.5 2013/01/19 11:03:17 obache Exp $
 
-SHA1 (testtools-0.9.15.tar.gz) = 985dddc38e0317d6c6f351665e74d57fcb86a1c8
-RMD160 (testtools-0.9.15.tar.gz) = c70c5a3b5fcff1219b8c0a43776a67db79b5633f
-Size (testtools-0.9.15.tar.gz) = 152830 bytes
+SHA1 (testtools-0.9.24.tar.gz) = c7a5d320e04a055ebd34db591cd3742a71caa20f
+RMD160 (testtools-0.9.24.tar.gz) = aac6937dbb80c471de409b971f24eaf59f23fb2c
+Size (testtools-0.9.24.tar.gz) = 162842 bytes