mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
Include mimeparse, which is used by subunit/testtools.
Change-Id: I984c82acc0bc82a165e8ea17d8948c465c786905 Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org> Autobuild-Date(master): Sat Nov 22 04:44:11 CET 2014 on sn-devel-104
This commit is contained in:
Jelmer Vernooij
parent
d857e7b1a7
commit
2c67d55614
0
lib/mimeparse/__init__.py
Normal file
0
lib/mimeparse/__init__.py
Normal file
167
lib/mimeparse/mimeparse.py
Normal file
167
lib/mimeparse/mimeparse.py
Normal file
@ -0,0 +1,167 @@
|
||||
"""MIME-Type Parser
|
||||
|
||||
This module provides basic functions for handling mime-types. It can handle
|
||||
matching mime-types against a list of media-ranges. See section 14.1 of the
|
||||
HTTP specification [RFC 2616] for a complete explanation.
|
||||
|
||||
http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
|
||||
|
||||
Contents:
|
||||
- parse_mime_type(): Parses a mime-type into its component parts.
|
||||
- parse_media_range(): Media-ranges are mime-types with wild-cards and a 'q'
|
||||
quality parameter.
|
||||
- quality(): Determines the quality ('q') of a mime-type when
|
||||
compared against a list of media-ranges.
|
||||
- quality_parsed(): Just like quality() except the second parameter must be
|
||||
pre-parsed.
|
||||
- best_match(): Choose the mime-type with the highest quality ('q')
|
||||
from a list of candidates.
|
||||
"""
|
||||
|
||||
__version__ = '0.1.3'
|
||||
__author__ = 'Joe Gregorio'
|
||||
__email__ = 'joe@bitworking.org'
|
||||
__license__ = 'MIT License'
|
||||
__credits__ = ''
|
||||
|
||||
|
||||
def parse_mime_type(mime_type):
|
||||
"""Parses a mime-type into its component parts.
|
||||
|
||||
Carves up a mime-type and returns a tuple of the (type, subtype, params)
|
||||
where 'params' is a dictionary of all the parameters for the media range.
|
||||
For example, the media range 'application/xhtml;q=0.5' would get parsed
|
||||
into:
|
||||
|
||||
('application', 'xhtml', {'q', '0.5'})
|
||||
"""
|
||||
parts = mime_type.split(';')
|
||||
params = dict([tuple([s.strip() for s in param.split('=', 1)])\
|
||||
for param in parts[1:]
|
||||
])
|
||||
full_type = parts[0].strip()
|
||||
# Java URLConnection class sends an Accept header that includes a
|
||||
# single '*'. Turn it into a legal wildcard.
|
||||
if full_type == '*':
|
||||
full_type = '*/*'
|
||||
(type, subtype) = full_type.split('/')
|
||||
|
||||
return (type.strip(), subtype.strip(), params)
|
||||
|
||||
|
||||
def parse_media_range(range):
|
||||
"""Parse a media-range into its component parts.
|
||||
|
||||
Carves up a media range and returns a tuple of the (type, subtype,
|
||||
params) where 'params' is a dictionary of all the parameters for the media
|
||||
range. For example, the media range 'application/*;q=0.5' would get parsed
|
||||
into:
|
||||
|
||||
('application', '*', {'q', '0.5'})
|
||||
|
||||
In addition this function also guarantees that there is a value for 'q'
|
||||
in the params dictionary, filling it in with a proper default if
|
||||
necessary.
|
||||
"""
|
||||
(type, subtype, params) = parse_mime_type(range)
|
||||
if 'q' not in params or not params['q'] or \
|
||||
not float(params['q']) or float(params['q']) > 1\
|
||||
or float(params['q']) < 0:
|
||||
params['q'] = '1'
|
||||
|
||||
return (type, subtype, params)
|
||||
|
||||
|
||||
def fitness_and_quality_parsed(mime_type, parsed_ranges):
|
||||
"""Find the best match for a mime-type amongst parsed media-ranges.
|
||||
|
||||
Find the best match for a given mime-type against a list of media_ranges
|
||||
that have already been parsed by parse_media_range(). Returns a tuple of
|
||||
the fitness value and the value of the 'q' quality parameter of the best
|
||||
match, or (-1, 0) if no match was found. Just as for quality_parsed(),
|
||||
'parsed_ranges' must be a list of parsed media ranges.
|
||||
"""
|
||||
best_fitness = -1
|
||||
best_fit_q = 0
|
||||
(target_type, target_subtype, target_params) =\
|
||||
parse_media_range(mime_type)
|
||||
for (type, subtype, params) in parsed_ranges:
|
||||
type_match = (type == target_type or\
|
||||
type == '*' or\
|
||||
target_type == '*')
|
||||
subtype_match = (subtype == target_subtype or\
|
||||
subtype == '*' or\
|
||||
target_subtype == '*')
|
||||
if type_match and subtype_match:
|
||||
param_matches = sum([1 for (key, value) in \
|
||||
target_params.items() if key != 'q' and \
|
||||
key in params and value == params[key]], 0)
|
||||
fitness = (type == target_type) and 100 or 0
|
||||
fitness += (subtype == target_subtype) and 10 or 0
|
||||
fitness += param_matches
|
||||
if fitness > best_fitness:
|
||||
best_fitness = fitness
|
||||
best_fit_q = params['q']
|
||||
|
||||
return best_fitness, float(best_fit_q)
|
||||
|
||||
|
||||
def quality_parsed(mime_type, parsed_ranges):
|
||||
"""Find the best match for a mime-type amongst parsed media-ranges.
|
||||
|
||||
Find the best match for a given mime-type against a list of media_ranges
|
||||
that have already been parsed by parse_media_range(). Returns the 'q'
|
||||
quality parameter of the best match, 0 if no match was found. This function
|
||||
bahaves the same as quality() except that 'parsed_ranges' must be a list of
|
||||
parsed media ranges. """
|
||||
|
||||
return fitness_and_quality_parsed(mime_type, parsed_ranges)[1]
|
||||
|
||||
|
||||
def quality(mime_type, ranges):
|
||||
"""Return the quality ('q') of a mime-type against a list of media-ranges.
|
||||
|
||||
Returns the quality 'q' of a mime-type when compared against the
|
||||
media-ranges in ranges. For example:
|
||||
|
||||
>>> quality('text/html','text/*;q=0.3, text/html;q=0.7,
|
||||
text/html;level=1, text/html;level=2;q=0.4, */*;q=0.5')
|
||||
0.7
|
||||
|
||||
"""
|
||||
parsed_ranges = [parse_media_range(r) for r in ranges.split(',')]
|
||||
|
||||
return quality_parsed(mime_type, parsed_ranges)
|
||||
|
||||
|
||||
def best_match(supported, header):
|
||||
"""Return mime-type with the highest quality ('q') from list of candidates.
|
||||
|
||||
Takes a list of supported mime-types and finds the best match for all the
|
||||
media-ranges listed in header. The value of header must be a string that
|
||||
conforms to the format of the HTTP Accept: header. The value of 'supported'
|
||||
is a list of mime-types. The list of supported mime-types should be sorted
|
||||
in order of increasing desirability, in case of a situation where there is
|
||||
a tie.
|
||||
|
||||
>>> best_match(['application/xbel+xml', 'text/xml'],
|
||||
'text/*;q=0.5,*/*; q=0.1')
|
||||
'text/xml'
|
||||
"""
|
||||
split_header = _filter_blank(header.split(','))
|
||||
parsed_header = [parse_media_range(r) for r in split_header]
|
||||
weighted_matches = []
|
||||
pos = 0
|
||||
for mime_type in supported:
|
||||
weighted_matches.append((fitness_and_quality_parsed(mime_type,
|
||||
parsed_header), pos, mime_type))
|
||||
pos += 1
|
||||
weighted_matches.sort()
|
||||
|
||||
return weighted_matches[-1][0][1] and weighted_matches[-1][2] or ''
|
||||
|
||||
|
||||
def _filter_blank(i):
|
||||
for s in i:
|
||||
if s.strip():
|
||||
yield s
|
||||
68
lib/mimeparse/mimeparse_test.py
Normal file
68
lib/mimeparse/mimeparse_test.py
Normal file
@ -0,0 +1,68 @@
|
||||
"""
|
||||
Python tests for Mime-Type Parser.
|
||||
|
||||
This module loads a json file and converts the tests specified therein to a set
|
||||
of PyUnitTestCases. Then it uses PyUnit to run them and report their status.
|
||||
"""
|
||||
__version__ = "0.1"
|
||||
__author__ = 'Ade Oshineye'
|
||||
__email__ = "ade@oshineye.com"
|
||||
__credits__ = ""
|
||||
|
||||
import mimeparse
|
||||
import unittest
|
||||
from functools import partial
|
||||
# Conditional import to support Python 2.5
|
||||
try:
|
||||
import json
|
||||
except ImportError:
|
||||
import simplejson as json
|
||||
|
||||
def test_parse_media_range(args, expected):
|
||||
expected = tuple(expected)
|
||||
result = mimeparse.parse_media_range(args)
|
||||
message = "Expected: '%s' but got %s" % (expected, result)
|
||||
assert expected == result, message
|
||||
|
||||
def test_quality(args, expected):
|
||||
result = mimeparse.quality(args[0], args[1])
|
||||
message = "Expected: '%s' but got %s" % (expected, result)
|
||||
assert expected == result, message
|
||||
|
||||
def test_best_match(args, expected):
|
||||
result = mimeparse.best_match(args[0], args[1])
|
||||
message = "Expected: '%s' but got %s" % (expected, result)
|
||||
assert expected == result, message
|
||||
|
||||
def test_parse_mime_type(args, expected):
|
||||
expected = tuple(expected)
|
||||
result = mimeparse.parse_mime_type(args)
|
||||
message = "Expected: '%s' but got %s" % (expected, result)
|
||||
assert expected == result, message
|
||||
|
||||
def add_tests(suite, json_object, func_name, test_func):
|
||||
test_data = json_object[func_name]
|
||||
for test_datum in test_data:
|
||||
args, expected = test_datum[0], test_datum[1]
|
||||
desc = "%s(%s) with expected result: %s" % (func_name, str(args), str(expected))
|
||||
if len(test_datum) == 3:
|
||||
desc = test_datum[2] + " : " + desc
|
||||
func = partial(test_func, *(args, expected))
|
||||
func.__name__ = test_func.__name__
|
||||
testcase = unittest.FunctionTestCase(func, description=desc)
|
||||
suite.addTest(testcase)
|
||||
|
||||
def run_tests():
|
||||
json_object = json.load(open("testdata.json"))
|
||||
|
||||
suite = unittest.TestSuite()
|
||||
add_tests(suite, json_object, "parse_media_range", test_parse_media_range)
|
||||
add_tests(suite, json_object, "quality", test_quality)
|
||||
add_tests(suite, json_object, "best_match", test_best_match)
|
||||
add_tests(suite, json_object, "parse_mime_type", test_parse_mime_type)
|
||||
|
||||
test_runner = unittest.TextTestRunner(verbosity=1)
|
||||
test_runner.run(suite)
|
||||
|
||||
if __name__ == "__main__":
|
||||
run_tests()
|
||||
50
lib/mimeparse/setup.py
Normal file
50
lib/mimeparse/setup.py
Normal file
@ -0,0 +1,50 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
#old way
|
||||
from distutils.core import setup
|
||||
|
||||
#new way
|
||||
#from setuptools import setup, find_packages
|
||||
|
||||
setup(name='mimeparse',
|
||||
version='0.1.4',
|
||||
description='A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges.',
|
||||
long_description="""
|
||||
This module provides basic functions for handling mime-types. It can handle
|
||||
matching mime-types against a list of media-ranges. See section 14.1 of
|
||||
the HTTP specification [RFC 2616] for a complete explanation.
|
||||
|
||||
http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
|
||||
|
||||
Contents:
|
||||
- parse_mime_type(): Parses a mime-type into its component parts.
|
||||
- parse_media_range(): Media-ranges are mime-types with wild-cards and a 'q' quality parameter.
|
||||
- quality(): Determines the quality ('q') of a mime-type when compared against a list of media-ranges.
|
||||
- quality_parsed(): Just like quality() except the second parameter must be pre-parsed.
|
||||
- best_match(): Choose the mime-type with the highest quality ('q') from a list of candidates.
|
||||
""",
|
||||
classifiers=[
|
||||
# Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: MIT License',
|
||||
'Programming Language :: Python',
|
||||
'Topic :: Internet :: WWW/HTTP',
|
||||
'Topic :: Software Development :: Libraries :: Python Modules',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.5',
|
||||
'Programming Language :: Python :: 2.6',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.1',
|
||||
'Programming Language :: Python :: 3.2',
|
||||
'Programming Language :: Python :: 3.3',
|
||||
],
|
||||
keywords='mime-type',
|
||||
author='Joe Gregorio',
|
||||
author_email='joe@bitworking.org',
|
||||
maintainer='Joe Gregorio',
|
||||
maintainer_email='joe@bitworking.org',
|
||||
url='http://code.google.com/p/mimeparse/',
|
||||
license='MIT',
|
||||
py_modules=['mimeparse']
|
||||
)
|
||||
@ -6,6 +6,416 @@ Changes and improvements to testtools_, grouped by release.
|
||||
NEXT
|
||||
~~~~
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* Fixed unit tests which were failing under pypy due to a change in the way
|
||||
pypy formats tracebacks. (Thomi Richards)
|
||||
|
||||
* Make `testtools.content.text_content` error if anything other than text
|
||||
is given as content. (Thomi Richards)
|
||||
|
||||
* We now publish wheels of testtools. (Robert Collins, #issue84)
|
||||
|
||||
1.1.0
|
||||
~~~~~
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Exceptions in a ``fixture.getDetails`` method will no longer mask errors
|
||||
raised from the same fixture's ``setUp`` method.
|
||||
(Robert Collins, #1368440)
|
||||
|
||||
1.0.0
|
||||
~~~~~
|
||||
|
||||
Long overdue, we've adopted a backwards compatibility statement and recognized
|
||||
that we have plenty of users depending on our behaviour - calling our version
|
||||
1.0.0 is a recognition of that.
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Fix a long-standing bug where tearDown and cleanUps would not be called if the
|
||||
test run was interrupted. This should fix leaking external resources from
|
||||
interrupted tests.
|
||||
(Robert Collins, #1364188)
|
||||
|
||||
* Fix a long-standing bug where calling sys.exit(0) from within a test would
|
||||
cause the test suite to exit with 0, without reporting a failure of that
|
||||
test. We still allow the test suite to be exited (since catching higher order
|
||||
exceptions requires exceptional circumstances) but we now call a last-resort
|
||||
handler on the TestCase, resulting in an error being reported for the test.
|
||||
(Robert Collins, #1364188)
|
||||
|
||||
* Fix an issue where tests skipped with the ``skip``* family of decorators would
|
||||
still have their ``setUp`` and ``tearDown`` functions called.
|
||||
(Thomi Richards, #https://github.com/testing-cabal/testtools/issues/86)
|
||||
|
||||
* We have adopted a formal backwards compatibility statement (see hacking.rst)
|
||||
(Robert Collins)
|
||||
|
||||
0.9.39
|
||||
~~~~~~
|
||||
|
||||
Brown paper bag release - 0.9.38 was broken for some users,
|
||||
_jython_aware_splitext was not defined entirely compatibly.
|
||||
(Robert Collins, #https://github.com/testing-cabal/testtools/issues/100)
|
||||
|
||||
0.9.38
|
||||
~~~~~~
|
||||
|
||||
Bug fixes for test importing.
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Discovery import error detection wasn't implemented for python 2.6 (the
|
||||
'discover' module). (Robert Collins)
|
||||
|
||||
* Discovery now executes load_tests (if present) in __init__ in all packages.
|
||||
(Robert Collins, http://bugs.python.org/issue16662)
|
||||
|
||||
0.9.37
|
||||
~~~~~~
|
||||
|
||||
Minor improvements to correctness.
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* ``stdout`` is now correctly honoured on ``run.TestProgram`` - before the
|
||||
runner objects would be created with no stdout parameter. If construction
|
||||
fails, the previous parameter list is attempted, permitting compatibility
|
||||
with Runner classes that don't accept stdout as a parameter.
|
||||
(Robert Collins)
|
||||
|
||||
* The ``ExtendedToStreamDecorator`` now handles content objects with one less
|
||||
packet - the last packet of the source content is sent with EOF set rather
|
||||
than an empty packet with EOF set being sent after the last packet of the
|
||||
source content. (Robert Collins)
|
||||
|
||||
0.9.36
|
||||
~~~~~~
|
||||
|
||||
Welcome to our long overdue 0.9.36 release, which improves compatibility with
|
||||
Python3.4, adds assert_that, a function for using matchers without TestCase
|
||||
objects, and finally will error if you try to use setUp or tearDown twice -
|
||||
since that invariably leads to bad things of one sort or another happening.
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* Error if ``setUp`` or ``tearDown`` are called twice.
|
||||
(Robert Collins, #882884)
|
||||
|
||||
* Make testtools compatible with the ``unittest.expectedFailure`` decorator in
|
||||
Python 3.4. (Thomi Richards)
|
||||
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Introduce the assert_that function, which allows matchers to be used
|
||||
independent of testtools.TestCase. (Daniel Watkins, #1243834)
|
||||
|
||||
|
||||
0.9.35
|
||||
~~~~~~
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* Removed a number of code paths where Python 2.4 and Python 2.5 were
|
||||
explicitly handled. (Daniel Watkins)
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Added the ``testtools.TestCase.expectThat`` method, which implements
|
||||
delayed assertions. (Thomi Richards)
|
||||
|
||||
* Docs are now built as part of the Travis-CI build, reducing the chance of
|
||||
Read The Docs being broken accidentally. (Daniel Watkins, #1158773)
|
||||
|
||||
0.9.34
|
||||
~~~~~~
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Added ability for ``testtools.TestCase`` instances to force a test to
|
||||
fail, even if no assertions failed. (Thomi Richards)
|
||||
|
||||
* Added ``testtools.content.StacktraceContent``, a content object that
|
||||
automatically creates a ``StackLinesContent`` object containing the current
|
||||
stack trace. (Thomi Richards)
|
||||
|
||||
* ``AnyMatch`` is now exported properly in ``testtools.matchers``.
|
||||
(Robert Collins, Rob Kennedy, github #44)
|
||||
|
||||
* In Python 3.3, if there are duplicate test ids, tests.sort() will
|
||||
fail and raise TypeError. Detect the duplicate test ids firstly in
|
||||
sorted_tests() to ensure that all test ids are unique.
|
||||
(Kui Shi, #1243922)
|
||||
|
||||
* ``json_content`` is now in the ``__all__`` attribute for
|
||||
``testtools.content``. (Robert Collins)
|
||||
|
||||
* Network tests now bind to 127.0.0.1 to avoid (even temporary) network
|
||||
visible ports. (Benedikt Morbach, github #46)
|
||||
|
||||
* Test listing now explicitly indicates by printing 'Failed to import' and
|
||||
exiting (2) when an import has failed rather than only signalling through the
|
||||
test name. (Robert Collins, #1245672)
|
||||
|
||||
* ``test_compat.TestDetectEncoding.test_bom`` now works on Python 3.3 - the
|
||||
corner case with euc_jp is no longer permitted in Python 3.3 so we can
|
||||
skip it. (Martin [gz], #1251962)
|
||||
|
||||
0.9.33
|
||||
~~~~~~
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Added ``addDetailuniqueName`` method to ``testtools.TestCase`` class.
|
||||
(Thomi Richards)
|
||||
|
||||
* Removed some unused code from ``testtools.content.TracebackContent``.
|
||||
(Thomi Richards)
|
||||
|
||||
* Added ``testtools.StackLinesContent``: a content object for displaying
|
||||
pre-processed stack lines. (Thomi Richards)
|
||||
|
||||
* ``StreamSummary`` was calculating testsRun incorrectly: ``exists`` status
|
||||
tests were counted as run tests, but they are not.
|
||||
(Robert Collins, #1203728)
|
||||
|
||||
0.9.32
|
||||
~~~~~~
|
||||
|
||||
Regular maintenance release. Special thanks to new contributor, Xiao Hanyu!
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* ``testttols.compat._format_exc_info`` has been refactored into several
|
||||
smaller functions. (Thomi Richards)
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Stacktrace filtering no longer hides unittest frames that are surrounded by
|
||||
user frames. We will reenable this when we figure out a better algorithm for
|
||||
retaining meaning. (Robert Collins, #1188420)
|
||||
|
||||
* The compatibility code for skipped tests with unittest2 was broken.
|
||||
(Robert Collins, #1190951)
|
||||
|
||||
* Various documentation improvements (Clint Byrum, Xiao Hanyu).
|
||||
|
||||
0.9.31
|
||||
~~~~~~
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* ``ExpectedException`` now accepts a msg parameter for describing an error,
|
||||
much the same as assertEquals etc. (Robert Collins)
|
||||
|
||||
0.9.30
|
||||
~~~~~~
|
||||
|
||||
A new sort of TestResult, the StreamResult has been added, as a prototype for
|
||||
a revised standard library test result API. Expect this API to change.
|
||||
Although we will try to preserve compatibility for early adopters, it is
|
||||
experimental and we might need to break it if it turns out to be unsuitable.
|
||||
|
||||
Improvements
|
||||
------------
|
||||
* ``assertRaises`` works properly for exception classes that have custom
|
||||
metaclasses
|
||||
|
||||
* ``ConcurrentTestSuite`` was silently eating exceptions that propagate from
|
||||
the test.run(result) method call. Ignoring them is fine in a normal test
|
||||
runner, but when they happen in a different thread, the thread that called
|
||||
suite.run() is not in the stack anymore, and the exceptions are lost. We now
|
||||
create a synthetic test recording any such exception.
|
||||
(Robert Collins, #1130429)
|
||||
|
||||
* Fixed SyntaxError raised in ``_compat2x.py`` when installing via Python 3.
|
||||
(Will Bond, #941958)
|
||||
|
||||
* New class ``StreamResult`` which defines the API for the new result type.
|
||||
(Robert Collins)
|
||||
|
||||
* New support class ``ConcurrentStreamTestSuite`` for convenient construction
|
||||
and utilisation of ``StreamToQueue`` objects. (Robert Collins)
|
||||
|
||||
* New support class ``CopyStreamResult`` which forwards events onto multiple
|
||||
``StreamResult`` objects (each of which receives all the events).
|
||||
(Robert Collins)
|
||||
|
||||
* New support class ``StreamSummary`` which summarises a ``StreamResult``
|
||||
stream compatibly with ``TestResult`` code. (Robert Collins)
|
||||
|
||||
* New support class ``StreamTagger`` which adds or removes tags from
|
||||
``StreamResult`` events. (RobertCollins)
|
||||
|
||||
* New support class ``StreamToDict`` which converts a ``StreamResult`` to a
|
||||
series of dicts describing a test. Useful for writing trivial stream
|
||||
analysers. (Robert Collins)
|
||||
|
||||
* New support class ``TestControl`` which permits cancelling an in-progress
|
||||
run. (Robert Collins)
|
||||
|
||||
* New support class ``StreamFailFast`` which calls a ``TestControl`` instance
|
||||
to abort the test run when a failure is detected. (Robert Collins)
|
||||
|
||||
* New support class ``ExtendedToStreamDecorator`` which translates both regular
|
||||
unittest TestResult API calls and the ExtendedTestResult API which testtools
|
||||
has supported into the StreamResult API. ExtendedToStreamDecorator also
|
||||
forwards calls made in the StreamResult API, permitting it to be used
|
||||
anywhere a StreamResult is used. Key TestResult query methods like
|
||||
wasSuccessful and shouldStop are synchronised with the StreamResult API
|
||||
calls, but the detailed statistics like the list of errors are not - a
|
||||
separate consumer will be created to support that.
|
||||
(Robert Collins)
|
||||
|
||||
* New support class ``StreamToExtendedDecorator`` which translates
|
||||
``StreamResult`` API calls into ``ExtendedTestResult`` (or any older
|
||||
``TestResult``) calls. This permits using un-migrated result objects with
|
||||
new runners / tests. (Robert Collins)
|
||||
|
||||
* New support class ``StreamToQueue`` for sending messages to one
|
||||
``StreamResult`` from multiple threads. (Robert Collins)
|
||||
|
||||
* New support class ``TimestampingStreamResult`` which adds a timestamp to
|
||||
events with no timestamp. (Robert Collins)
|
||||
|
||||
* New ``TestCase`` decorator ``DecorateTestCaseResult`` that adapts the
|
||||
``TestResult`` or ``StreamResult`` a case will be run with, for ensuring that
|
||||
a particular result object is used even if the runner running the test doesn't
|
||||
know to use it. (Robert Collins)
|
||||
|
||||
* New test support class ``testtools.testresult.doubles.StreamResult``, which
|
||||
captures all the StreamResult events. (Robert Collins)
|
||||
|
||||
* ``PlaceHolder`` can now hold tags, and applies them before, and removes them
|
||||
after, the test. (Robert Collins)
|
||||
|
||||
* ``PlaceHolder`` can now hold timestamps, and applies them before the test and
|
||||
then before the outcome. (Robert Collins)
|
||||
|
||||
* ``StreamResultRouter`` added. This is useful for demultiplexing - e.g. for
|
||||
partitioning analysis of events or sending feedback encapsulated in
|
||||
StreamResult events back to their source. (Robert Collins)
|
||||
|
||||
* ``testtools.run.TestProgram`` now supports the ``TestRunner`` taking over
|
||||
responsibility for formatting the output of ``--list-tests``.
|
||||
(Robert Collins)
|
||||
|
||||
* The error message for setUp and tearDown upcall errors was broken on Python
|
||||
3.4. (Monty Taylor, Robert Collins, #1140688)
|
||||
|
||||
* The repr of object() on pypy includes the object id, which was breaking a
|
||||
test that accidentally depended on the CPython repr for object().
|
||||
(Jonathan Lange)
|
||||
|
||||
0.9.29
|
||||
~~~~~~
|
||||
|
||||
A simple bug fix, and better error messages when you don't up-call.
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* ``testtools.content_type.ContentType`` incorrectly used ',' rather than ';'
|
||||
to separate parameters. (Robert Collins)
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* ``testtools.compat.unicode_output_stream`` was wrapping a stream encoder
|
||||
around ``io.StringIO`` and ``io.TextIOWrapper`` objects, which was incorrect.
|
||||
(Robert Collins)
|
||||
|
||||
* Report the name of the source file for setUp and tearDown upcall errors.
|
||||
(Monty Taylor)
|
||||
|
||||
0.9.28
|
||||
~~~~~~
|
||||
|
||||
Testtools has moved VCS - https://github.com/testing-cabal/testtools/ is
|
||||
the new home. Bug tracking is still on Launchpad, and releases are on Pypi.
|
||||
|
||||
We made this change to take advantage of the richer ecosystem of tools around
|
||||
Git, and to lower the barrier for new contributors.
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* New ``testtools.testcase.attr`` and ``testtools.testcase.WithAttributes``
|
||||
helpers allow marking up test case methods with simple labels. This permits
|
||||
filtering tests with more granularity than organising them into modules and
|
||||
test classes. (Robert Collins)
|
||||
|
||||
0.9.27
|
||||
~~~~~~
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* New matcher ``HasLength`` for matching the length of a collection.
|
||||
(Robert Collins)
|
||||
|
||||
* New matcher ``MatchesPredicateWithParams`` make it still easier to create
|
||||
ad hoc matchers. (Robert Collins)
|
||||
|
||||
* We have a simpler release process in future - see doc/hacking.rst.
|
||||
(Robert Collins)
|
||||
|
||||
0.9.26
|
||||
~~~~~~
|
||||
|
||||
Brown paper bag fix: failed to document the need for setup to be able to use
|
||||
extras. Compounded by pip not supporting setup_requires.
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* setup.py now can generate egg_info even if extras is not available.
|
||||
Also lists extras in setup_requires for easy_install.
|
||||
(Robert Collins, #1102464)
|
||||
|
||||
0.9.25
|
||||
~~~~~~
|
||||
|
||||
Changes
|
||||
-------
|
||||
|
||||
* ``python -m testtools.run --load-list`` will now preserve any custom suites
|
||||
(such as ``testtools.FixtureSuite`` or ``testresources.OptimisingTestSuite``)
|
||||
rather than flattening them.
|
||||
(Robert Collins, #827175)
|
||||
|
||||
* Testtools now depends on extras, a small library split out from it to contain
|
||||
generally useful non-testing facilities. Since extras has been around for a
|
||||
couple of testtools releases now, we're making this into a hard dependency of
|
||||
testtools. (Robert Collins)
|
||||
|
||||
* Testtools now uses setuptools rather than distutils so that we can document
|
||||
the extras dependency. (Robert Collins)
|
||||
|
||||
Improvements
|
||||
------------
|
||||
|
||||
* Testtools will no longer override test code registered details called
|
||||
'traceback' when reporting caught exceptions from test code.
|
||||
(Robert Collins, #812793)
|
||||
|
||||
0.9.24
|
||||
~~~~~~
|
||||
|
||||
|
||||
@ -41,4 +41,14 @@ git clone git://github.com/testing-cabal/extras "$WORKDIR/extras"
|
||||
rm -rf "$WORKDIR/extras/.git"
|
||||
rsync -avz --delete "$WORKDIR/extras/" "$LIBDIR/extras/"
|
||||
|
||||
echo "Updating extra..."
|
||||
git clone git://github.com/testing-cabal/extras "$WORKDIR/extras"
|
||||
rm -rf "$WORKDIR/extras/.git"
|
||||
rsync -avz --delete "$WORKDIR/extras/" "$LIBDIR/extras/"
|
||||
|
||||
echo "Updating mimeparse..."
|
||||
svn co http://mimeparse.googlecode.com/svn/trunk/ "$WORKDIR/mimeparse"
|
||||
rm -rf "$WORKDIR/mimeparse/.svn"
|
||||
rsync -avz --delete "$WORKDIR/mimeparse/" "$LIBDIR/mimeparse/"
|
||||
|
||||
rm -rf "$WORKDIR"
|
||||
|
||||
@ -7,6 +7,7 @@ external_libs = {
|
||||
"subunit": "subunit/python/subunit",
|
||||
"testtools": "testtools/testtools",
|
||||
"extras": "extras/extras",
|
||||
"mimeparse": "mimeparse/mimeparse",
|
||||
}
|
||||
|
||||
list = []
|
||||
|
||||
@ -25,6 +25,8 @@ import signal
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/subunit/python"))
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools"))
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/mimeparse"))
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/extras"))
|
||||
|
||||
import subunithelper
|
||||
|
||||
|
||||
@ -11,6 +11,8 @@ import sys
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/subunit/python"))
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools"))
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/mimeparse"))
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/extras"))
|
||||
|
||||
import subunithelper
|
||||
|
||||
|
||||
@ -68,7 +68,8 @@ else:
|
||||
python = os.getenv("PYTHON", "python")
|
||||
|
||||
# Set a default value, overridden if we find a working one on the system
|
||||
tap2subunit = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools %s %s/lib/subunit/filters/tap2subunit" % (srcdir(), srcdir(), python, srcdir())
|
||||
tap2subunit = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools:%s/lib/extras:%s/lib/mimeparse %s %s/lib/subunit/filters/tap2subunit" % (srcdir(), srcdir(), srcdir(), srcdir(), python, srcdir())
|
||||
subunit2to1 = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools:%s/lib/extras:%s/lib/mimeparse %s %s/lib/subunit/filters/subunit-2to1" % (srcdir(), srcdir(), srcdir(), srcdir(), python, srcdir())
|
||||
|
||||
sub = subprocess.Popen("tap2subunit", stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
@ -172,8 +173,11 @@ def planpythontestsuite(env, module, name=None, extra_path=[]):
|
||||
name = module
|
||||
pypath = list(extra_path)
|
||||
if not has_system_subunit_run:
|
||||
pypath.extend(["%s/lib/subunit/python" % srcdir(),
|
||||
"%s/lib/testtools" % srcdir()])
|
||||
pypath.extend([
|
||||
"%s/lib/subunit/python" % srcdir(),
|
||||
"%s/lib/testtools" % srcdir(),
|
||||
"%s/lib/extras" % srcdir(),
|
||||
"%s/lib/mimeparse" % srcdir()])
|
||||
args = [python, "-m", "subunit.run", "$LISTOPT", module]
|
||||
if pypath:
|
||||
args.insert(0, "PYTHONPATH=%s" % ":".join(["$PYTHONPATH"] + pypath))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user