Skip to content

Commit

Permalink
Unconditionally reset serializer preferences for every test.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed Jun 12, 2023
1 parent a90425a commit 46ecd32
Show file tree
Hide file tree
Showing 15 changed files with 5 additions and 61 deletions.
5 changes: 5 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@ def saved_profiles(monkeypatch):
def raise_exceptions():
# configure log to raise exceptions
cssutils.log.raiseExceptions = True


@pytest.fixture(autouse=True)
def restore_serializer_preference_defaults():
cssutils.ser.prefs.useDefaults()
3 changes: 0 additions & 3 deletions cssutils/tests/test_cssmediarule.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@ def test_cssText(self):
assert m == r.parentRule
assert m.parentStyleSheet == r.parentStyleSheet

cssutils.ser.prefs.useDefaults()

def test_media(self):
"CSSMediaRule.media"
# see CSSImportRule.media
Expand All @@ -263,7 +261,6 @@ def test_media(self):
assert '' == self.r.cssText
cssutils.ser.prefs.keepEmptyRules = True
assert '@media print {\n a {}\n }' == self.r.cssText
cssutils.ser.prefs.useDefaults()

def test_name(self):
"CSSMediaRule.name"
Expand Down
4 changes: 0 additions & 4 deletions cssutils/tests/test_csspagerule.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@

class TestCSSPageRule(test_cssrule.TestCSSRule):
def _setup_rule(self):
cssutils.ser.prefs.useDefaults()
self.r = cssutils.css.CSSPageRule()
self.rRO = cssutils.css.CSSPageRule(readonly=True)
self.r_type = cssutils.css.CSSPageRule.PAGE_RULE #
self.r_typeString = 'PAGE_RULE'

def teardown(self):
cssutils.ser.prefs.useDefaults()

def test_init(self):
"CSSPageRule.__init__()"
super().test_init()
Expand Down
3 changes: 0 additions & 3 deletions cssutils/tests/test_cssrule.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ def _setup_rule(self):
self.r_type = cssutils.css.CSSRule.UNKNOWN_RULE
self.r_typeString = 'UNKNOWN_RULE'

def teardown_method(self):
cssutils.ser.prefs.useDefaults()

def test_init(self):
"CSSRule.type and init"
assert self.r_type == self.r.type
Expand Down
5 changes: 0 additions & 5 deletions cssutils/tests/test_cssstyledeclaration.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ def test_parse(self):
exp = '%s' % exp
assert exp == sh.cssRules[0].style.cssText

cssutils.ser.prefs.useDefaults()

def test_serialize(self):
"CSSStyleDeclaration serialize"
s = cssutils.css.CSSStyleDeclaration()
Expand All @@ -171,8 +169,6 @@ def test_serialize(self):
cssutils.ser.prefs.keepAllProperties = True
assert exp[1] == s.cssText

cssutils.ser.prefs.useDefaults()

def test_children(self):
"CSSStyleDeclaration.children()"
style = '/*1*/color: red; color: green; @x;'
Expand Down Expand Up @@ -418,7 +414,6 @@ def test_getPropertyPriority(self):

def test_removeProperty(self):
"CSSStyleDeclaration.removeProperty()"
cssutils.ser.prefs.useDefaults()
s = cssutils.css.CSSStyleDeclaration()
css = r'\x:0 !important; x:1; \x:2; x:3'

Expand Down
2 changes: 0 additions & 2 deletions cssutils/tests/test_cssstylerule.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ def test_cssText(self):
}
)
self.do_raise_r(tests) # set cssText
cssutils.ser.prefs.useDefaults()

def test_selectorList(self):
"CSSStyleRule.selectorList"
Expand Down Expand Up @@ -222,7 +221,6 @@ def test_incomplete(self):
''': '''p {\n color: green;\n color: green\n }''',
}
self.do_equal_p(tests, raising=False) # parse
cssutils.ser.prefs.useDefaults()

# TODO: def test_InvalidModificationErr(self):
# "CSSStyleRule.cssText InvalidModificationErr"
Expand Down
3 changes: 0 additions & 3 deletions cssutils/tests/test_cssstylesheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ def setup_method(self):
self.s = self.r # used here
self.rule = cssutils.css.CSSStyleRule()

def teardown_method(self):
cssutils.ser.prefs.useDefaults()

def test_init(self):
"CSSStyleSheet.__init__()"
assert 'text/css' == self.s.type
Expand Down
3 changes: 0 additions & 3 deletions cssutils/tests/test_cssunknownrule.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ def _setup_rule(self):
self.r_type = cssutils.css.CSSUnknownRule.UNKNOWN_RULE
self.r_typeString = 'UNKNOWN_RULE'

def teardown(self):
cssutils.ser.prefs.useDefaults()

def test_init(self):
"CSSUnknownRule.type and init"
super().test_init()
Expand Down
8 changes: 0 additions & 8 deletions cssutils/tests/test_cssutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ def serializer(monkeypatch):


class TestCSSutils(basetest.BaseTestCase):
def setup_method(self):
cssutils.ser.prefs.useDefaults()

def teardown_method(self):
cssutils.ser.prefs.useDefaults()

exp = '''@import "import/import2.css";
.import {
/* ./import.css */
Expand Down Expand Up @@ -481,5 +475,3 @@ def do():
z: url(b/subimg/subimg.gif)
}'''
assert expected == r.cssText

cssutils.ser.prefs.useDefaults()
4 changes: 0 additions & 4 deletions cssutils/tests/test_cssvariablesdeclaration.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
class TestCSSVariablesDeclaration(basetest.BaseTestCase):
def setup_method(self):
self.r = cssutils.css.CSSVariablesDeclaration()
cssutils.ser.prefs.useDefaults()

def teardown_method(self):
cssutils.ser.prefs.useDefaults()

def test_init(self):
"CSSVariablesDeclaration.__init__()"
Expand Down
4 changes: 0 additions & 4 deletions cssutils/tests/test_marginrule.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@

class TestMarginRule(test_cssrule.TestCSSRule):
def _setup_rule(self):
cssutils.ser.prefs.useDefaults()
self.r = cssutils.css.MarginRule()
self.rRO = cssutils.css.MarginRule(readonly=True)
self.r_type = cssutils.css.MarginRule.MARGIN_RULE
self.r_typeString = 'MARGIN_RULE'

def teardown(self):
cssutils.ser.prefs.useDefaults()

def test_init(self):
"MarginRule.__init__()"

Expand Down
13 changes: 0 additions & 13 deletions cssutils/tests/test_serialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ class TestPreferences(basetest.BaseTestCase):
testcases for cssutils.serialize.Preferences
"""

def setup_method(self):
cssutils.ser.prefs.useDefaults()

def teardown_method(self):
cssutils.ser.prefs.useDefaults()

# def testkeepUnkownAtRules(self):
# "Preferences.keepUnkownAtRules"
# from warnings import catch_warnings
Expand Down Expand Up @@ -135,7 +129,6 @@ def test_useDefaults(self):

def test_useMinified(self):
"Preferences.useMinified()"
cssutils.ser.prefs.useDefaults()
cssutils.ser.prefs.useMinified()
assert cssutils.ser.prefs.defaultAtKeyword
assert cssutils.ser.prefs.defaultPropertyName
Expand Down Expand Up @@ -631,12 +624,6 @@ class TestCSSSerializer:
testcases for cssutils.CSSSerializer
"""

def setup_method(self):
cssutils.ser.prefs.useDefaults()

def teardown_method(self):
cssutils.ser.prefs.useDefaults()

def test_canonical(self):
tests = {
'''1''': '''1''',
Expand Down
2 changes: 0 additions & 2 deletions cssutils/tests/test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ def test_set(self):
cssutils.parseString(text).cssText
== b'a{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=90)}'
)

cssutils.ser.prefs.useDefaults()
6 changes: 0 additions & 6 deletions cssutils/tests/test_x.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@


class XTestCase:
def setup(self):
cssutils.ser.prefs.useDefaults()

def teardown(self):
cssutils.ser.prefs.useDefaults()

@pytest.mark.xfail(reason="not implemented")
def test_priority(self):
"Property.priority"
Expand Down
1 change: 0 additions & 1 deletion examples/website.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ def work_and_build():
"""
>>> import cssutils, logging
>>> cssutils.log.setLevel(logging.FATAL)
>>> cssutils.ser.prefs.useDefaults()
>>> # --- RESET ---
>>> from cssutils import css, stylesheets
>>> sheet = css.CSSStyleSheet()
Expand Down

0 comments on commit 46ecd32

Please sign in to comment.