[robotframework] 2 new revisions pushed by mikko.ko...@gmail.com on 2011-06-21 20:13 GMT

[robotframework]

2 new revisions:

Revision: 14c94d35646f
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Tue Jun 21 13:12:45 2011
Log:      Exceptions do nothing if you do not raise them..
http://code.google.com/p/robotframework/source/detail?r=14c94d35646f
Revision: 48624d03f265
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Tue Jun 21 13:13:09 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=48624d03f265

==============================================================================
Revision: 14c94d35646f
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Tue Jun 21 13:12:45 2011
Log:      Exceptions do nothing if you do not raise them..
http://code.google.com/p/robotframework/source/detail?r=14c94d35646f

Modified:
 /utest/result/test_js_serializer.py

=======================================
--- /utest/result/test_js_serializer.py Tue Jun 21 12:40:38 2011
+++ /utest/result/test_js_serializer.py Tue Jun 21 13:12:45 2011
@@ -137,11 +137,11 @@
         result = []
         for entry in suite:
             if isinstance(entry, list):
-                result.append(self._reverse_from_ids(data_model, entry))
+                result += [self._reverse_from_ids(data_model, entry)]
             elif isinstance(entry, dict):
-                AssertionError("NYI")
+                result += [dict((self._reverse_from_ids(data_model, key),  
self._reverse_from_ids(data_model, value)) for key, value in entry.items())]
             else:
-                result.append(self._reverse_id(data_model, entry))
+                result += [self._reverse_id(data_model, entry)]
         return result

     def _reverse_id(self, data_model, id):
@@ -264,6 +264,9 @@
         doc = '*<b>html</b> &lt;esc&gt; <a  
href="http://x.y";>http://x.y</a> <img src="http://x.y/z.jpg";  
title="http://x.y/z.jpg"; style="border: 1px solid gray" />'
         self.assert_model(data_model, basemillis=1306918911353,
                            
plain_suite=['*suite', '*/tmp/verysimple.txt', '*Verysimple', doc,
+                                       {'*esc': '*&lt;',
+                                        '*key': '*val',
+                                        '*html': '*<img  
src="http://x.y.x.jpg"; title="http://x.y.x.jpg"; style="border: 1px solid  
gray" />'},
                               ['*test', '*Test', '*', '*Y', doc,
                                   ['*kw', '*Keyword.Example', '*1 second',  
doc,
                                    '*a1, a2', [0, '*W', '*simple'], ['*P',  
23, -23]],

==============================================================================
Revision: 48624d03f265
Author:   Mikko Korpela <mikko.korp...@gmail.com>
Date:     Tue Jun 21 13:13:09 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=48624d03f265