Mercurial > genshi > mirror
changeset 967:19ac5d8fd96c trunk
Fix a number of tests which Python's new hash randomization is causing to fail randomly.
| author | hodgestar |
|---|---|
| date | Sat, 29 Dec 2012 19:14:10 +0000 |
| parents | 570226c48119 |
| children | 2ed9827596a4 |
| files | genshi/builder.py genshi/template/tests/directives.py genshi/template/tests/eval.py genshi/tests/builder.py |
| diffstat | 4 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/genshi/builder.py +++ b/genshi/builder.py @@ -175,8 +175,8 @@ arguments will be converted to strings and any special XML characters escaped: - >>> print(Element('textarea', rows=10, cols=60)) - <textarea rows="10" cols="60"/> + >>> print(Element('textarea', rows=10)) + <textarea rows="10"/> >>> print(Element('span', title='1 < 2')) <span title="1 < 2"/> >>> print(Element('span', title='"baz"'))
--- a/genshi/template/tests/directives.py +++ b/genshi/template/tests/directives.py @@ -30,9 +30,9 @@ tmpl = MarkupTemplate("""<doc xmlns:py="http://genshi.edgewall.org/"> <elem py:for="item in items" py:attrs="item"/> </doc>""") - items = [{'id': 1, 'class': 'foo'}, {'id': 2, 'class': 'bar'}] + items = [{'id': 1}, {'id': 2}] self.assertEqual("""<doc> - <elem id="1" class="foo"/><elem id="2" class="bar"/> + <elem id="1"/><elem id="2"/> </doc>""", tmpl.generate(items=items).render(encoding=None)) def test_update_existing_attr(self): @@ -395,14 +395,14 @@ tmpl = MarkupTemplate("""<doc xmlns:py="http://genshi.edgewall.org/"> <div py:def="f(*args, **kwargs)"> ${repr(args)} - ${repr(kwargs)} + ${repr(sorted(kwargs.items()))} </div> ${f(1, 2, a=3, b=4)} </doc>""") self.assertEqual("""<doc> <div> [1, 2] - {'a': 3, 'b': 4} + [('a', 3), ('b', 4)] </div> </doc>""", tmpl.generate().render(encoding=None)) @@ -457,7 +457,7 @@ self.assertEqual("""<doc> <p>key=a, value=1</p> <p>key=b, value=2</p> - </doc>""", tmpl.generate(items=dict(a=1, b=2).items()) + </doc>""", tmpl.generate(items=(('a', 1), ('b', 2))) .render(encoding=None)) def test_nested_assignment(self): @@ -472,7 +472,7 @@ self.assertEqual("""<doc> <p>0: key=a, value=1</p> <p>1: key=b, value=2</p> - </doc>""", tmpl.generate(items=enumerate(dict(a=1, b=2).items())) + </doc>""", tmpl.generate(items=enumerate([('a', 1), ('b', 2)])) .render(encoding=None)) def test_not_iterable(self):
--- a/genshi/template/tests/eval.py +++ b/genshi/template/tests/eval.py @@ -588,7 +588,7 @@ """) data = {} suite.execute(data) - self.assertEqual(['fooabc', 'bardef'], data['x']) + self.assertEqual(['bardef', 'fooabc'], sorted(data['x'])) def test_def_nested(self): suite = Suite("""
--- a/genshi/tests/builder.py +++ b/genshi/tests/builder.py @@ -22,10 +22,10 @@ class ElementFactoryTestCase(unittest.TestCase): def test_link(self): - link = tag.a(href='#', title='Foo', accesskey=None)('Bar') + link = tag.a(href='#', accesskey=None)('Bar') events = list(link.generate()) self.assertEqual((Stream.START, - ('a', Attrs([('href', "#"), ('title', "Foo")])), + ('a', Attrs([('href', "#")])), (None, -1, -1)), events[0]) self.assertEqual((Stream.TEXT, 'Bar', (None, -1, -1)), events[1]) self.assertEqual((Stream.END, 'a', (None, -1, -1)), events[2])