##// END OF EJS Templates
Merge pull request #2231 from Carreau/ja...
Merge pull request #2231 from Carreau/ja Improve Image format validation and add html width,height This addresses the first two bullets of #2053 Validates first argument to constrain format to png, jpeg, Lets user specify width, height, or both and emits appropriate html I introduced a couple of class constants to minimize the number of times I saw 'jpeg' and 'png' and document the _ACCEPTABLE_FORMATS. I added one real jpeg image to the test directory and one zero-length gif file to survive the file not found error in super() Closes #2053 Add `assert_is_none`, `assert_is_not_none` to `nose.tools`

File last commit:

r8096:cc2ccfb5
r8116:19feb23c merge
Show More
nose_assert_methods.py
29 lines | 834 B | text/x-python | PythonLexer
"""Add some assert methods to nose.tools. These were added in Python 2.7/3.1, so
once we stop testing on Python 2.6, this file can be removed.
"""
import nose.tools as nt
def assert_in(item, collection):
assert item in collection, '%r not in %r' % (item, collection)
if not hasattr(nt, 'assert_in'):
nt.assert_in = assert_in
def assert_not_in(item, collection):
assert item not in collection, '%r in %r' % (item, collection)
if not hasattr(nt, 'assert_not_in'):
nt.assert_not_in = assert_not_in
def assert_is_none(obj):
assert obj is None, '%r is not None' % obj
if not hasattr(nt, 'assert_is_none'):
nt.assert_is_none = assert_is_none
def assert_is_not_none(obj):
assert obj is not None, '%r is None' % obj
if not hasattr(nt, 'assert_is_not_none'):
nt.assert_is_not_none = assert_is_not_none