3000f0a1e7
add quoteParse function to quote properly for gst.parse_launch() * morituri/common/checksum.py: Fix single quote problem. use self.setException() * morituri/common/encode.py: Fix single quote problem. * morituri/image/image.py: Fix single quote problem. Reraise gst.QueryError. * morituri/test/test_common_encode.py: * morituri/test/test_common_encode.py (added): Add tests for unicode/single/double quote. * morituri/test/test_image_image.py: * morituri/test/test_common_checksum.py: Add tests for single/double quote. * morituri/test/common.py: add twisted-like failUnlessRaises to TestCase that returns the exception, so we can check wrapped exceptions in TaskException.
56 lines
1.6 KiB
Python
56 lines
1.6 KiB
Python
# -*- Mode: Python -*-
|
|
# vi:si:et:sw=4:sts=4:ts=4
|
|
|
|
import sys
|
|
import unittest
|
|
|
|
from morituri.common import log
|
|
|
|
log.init()
|
|
|
|
# lifted from flumotion
|
|
|
|
def _diff(old, new, desc):
|
|
import difflib
|
|
lines = difflib.unified_diff(old, new)
|
|
lines = list(lines)
|
|
if not lines:
|
|
return
|
|
output = ''
|
|
for line in lines:
|
|
output += '%s: %s\n' % (desc, line[:-1])
|
|
|
|
raise AssertionError(
|
|
("\nError while comparing strings:\n"
|
|
"%s") % (output, ))
|
|
|
|
|
|
def diffStrings(orig, new, desc='input'):
|
|
|
|
def _tolines(s):
|
|
return [line + '\n' for line in s.split('\n')]
|
|
|
|
return _diff(_tolines(orig),
|
|
_tolines(new),
|
|
desc=desc)
|
|
|
|
class TestCase(unittest.TestCase):
|
|
# unittest.TestCase.failUnlessRaises does not return the exception,
|
|
# and we'd like to check for the actual exception under TaskException,
|
|
# so override the way twisted.trial.unittest does, without failure
|
|
def failUnlessRaises(self, exception, f, *args, **kwargs):
|
|
try:
|
|
result = f(*args, **kwargs)
|
|
except exception, inst:
|
|
return inst
|
|
except exception, e:
|
|
raise self.failureException('%s raised instead of %s:\n %s'
|
|
% (sys.exc_info()[0],
|
|
exception.__name__,
|
|
log.getExceptionMessage(e)))
|
|
else:
|
|
raise self.failureException('%s not raised (%r returned)'
|
|
% (exception.__name__, result))
|
|
|
|
assertRaises = failUnlessRaises
|