Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests that depended on css serialization settings

Browse Source
This commit is contained in:
Kovid Goyal 2022-07-31 21:46:32 +05:30
parent d21e62c624
commit 5e9a3de623
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/css_transform_rules.py
View File

@ -378,7 +378,7 @@ def test(return_tests=False): # {{{
r = Rule(**rule) r = Rule(**rule)
decl = StyleDeclaration(safe_parser().parseStyle(style)) decl = StyleDeclaration(safe_parser().parseStyle(style))
r.process_declaration(decl) r.process_declaration(decl)
return str(decl) return str(decl).rstrip(';')
class TestTransforms(unittest.TestCase): class TestTransforms(unittest.TestCase):
longMessage = True longMessage = True

2
src/calibre/ebooks/oeb/normalize_css.py
View File

@ -416,7 +416,7 @@ def test_normalization(return_tests=False): # {{{
css = '; '.join(f'border-{edge}-{p}: {v}' for edge in ('top',) for p, v in zip(BORDER_PROPS, vals.split())) css = '; '.join(f'border-{edge}-{p}: {v}' for edge in ('top',) for p, v in zip(BORDER_PROPS, vals.split()))
style = parseStyle(css) style = parseStyle(css)
condense_rule(style) condense_rule(style)
self.assertEqual(css_text(style), 'border-top: %s' % vals) self.assertEqual(css_text(style).rstrip(';'), 'border-top: %s' % vals)
css += ';' + '; '.join(f'border-{edge}-{p}: {v}' for edge in ('right', 'left', 'bottom') for p, v in css += ';' + '; '.join(f'border-{edge}-{p}: {v}' for edge in ('right', 'left', 'bottom') for p, v in
zip(BORDER_PROPS, vals.replace('red', 'green').split())) zip(BORDER_PROPS, vals.replace('red', 'green').split()))
style = parseStyle(css) style = parseStyle(css)

2
src/calibre/ebooks/oeb/polish/tests/cascade.py
View File

@ -212,7 +212,7 @@ class CascadeTest(BaseTest):
style = parseStyle('background-image: url(b.png); background: black url(a.png) fixed') style = parseStyle('background-image: url(b.png); background: black url(a.png) fixed')
for prop in style.getProperties(all=True): for prop in style.getProperties(all=True):
remove_property_value(prop, lambda val:'png' in val.cssText) remove_property_value(prop, lambda val:'png' in val.cssText)
self.assertEqual('background: black fixed', style.cssText) self.assertEqual('background: black fixed', style.cssText.rstrip(';'))
def test_fallback_font_matching(self): def test_fallback_font_matching(self):
def cf(id, weight='normal', style='normal', stretch='normal'): def cf(id, weight='normal', style='normal', stretch='normal'):

2
src/calibre/utils/run_tests.py
View File

@ -84,8 +84,10 @@ def itertests(suite):
def init_env(): def init_env():
from calibre.utils.config_base import reset_tweaks_to_default from calibre.utils.config_base import reset_tweaks_to_default
from calibre.ebooks.metadata.book.base import reset_field_metadata from calibre.ebooks.metadata.book.base import reset_field_metadata
from calibre.ebooks.oeb.polish.utils import setup_css_parser_serialization
reset_tweaks_to_default() reset_tweaks_to_default()
reset_field_metadata() reset_field_metadata()
setup_css_parser_serialization()
def filter_tests(suite, test_ok): def filter_tests(suite, test_ok):