Changeset 1191

Timestamp:

Dec 29, 2012, 8:14:10 PM (11 years ago)

Author:

hodgestar

Message:

Fix a number of tests which Python's new hash randomization is causing to fail randomly.

Location:

trunk/genshi

Files:

• builder.py (modified) (1 diff)
• template/tests/directives.py (modified) (5 diffs)
• template/tests/eval.py (modified) (1 diff)
• tests/builder.py (modified) (1 diff)

trunk/genshi/builder.py

@@ -176 +176 @@
     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 &lt; 2"/>

trunk/genshi/template/tests/directives.py

@@ -31 +31 @@
           <elem py:for="item in items" py:attrs="item"/>
         </doc>""")
-        items = [{'id': 1, 'class': 'foo'}, {'id': 2, 'class': 'bar'}]
-        self.assertEqual("""<doc>
-          <elem id="1" class="foo"/><elem id="2" class="bar"/>
+        items = [{'id': 1}, {'id': 2}]
+        self.assertEqual("""<doc>
+          <elem id="1"/><elem id="2"/>
         </doc>""", tmpl.generate(items=items).render(encoding=None))
 
@@ -396 +396 @@
           <div py:def="f(*args, **kwargs)">
             ${repr(args)}
-            ${repr(kwargs)}
+            ${repr(sorted(kwargs.items()))}
           </div>
           ${f(1, 2, a=3, b=4)}
@@ -403 +403 @@
           <div>
             [1, 2]
-            {'a': 3, 'b': 4}
+            [('a', 3), ('b', 4)]
           </div>
         </doc>""", tmpl.generate().render(encoding=None))
@@ -458 +458 @@
             <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))
 
@@ -473 +473 @@
             <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))
 

trunk/genshi/template/tests/eval.py

@@ -589 +589 @@
         data = {}
         suite.execute(data)
-        self.assertEqual(['fooabc', 'bardef'], data['x'])
+        self.assertEqual(['bardef', 'fooabc'], sorted(data['x']))
 
     def test_def_nested(self):

trunk/genshi/tests/builder.py

@@ -23 +23 @@
 
     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])