[robotframework] 2 new revisions pushed by janne.t.harkonen on 2011-06-28 19:58 GMT

[robotframework]

2 new revisions:

Revision: 4d7177056881
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 28 12:57:14 2011
Log:      Write keyword timeout to XML + test...
http://code.google.com/p/robotframework/source/detail?r=4d7177056881
Revision: d9387bc5e88c
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 28 12:57:56 2011
Log:      Read and render keyword timeout in log.html...
http://code.google.com/p/robotframework/source/detail?r=d9387bc5e88c

==============================================================================
Revision: 4d7177056881
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 28 12:57:14 2011
Log:      Write keyword timeout to XML + test

Update issue 891
Status: Started
Owner: janne.t.harkonen
http://code.google.com/p/robotframework/source/detail?r=4d7177056881

Added:
 /atest/robot/output/keyword_timeout.txt
Modified:
 /src/robot/running/keywords.py

=======================================
--- /dev/null
+++ /atest/robot/output/keyword_timeout.txt     Tue Jun 28 12:57:14 2011
@@ -0,0 +1,10 @@
+*** Settings ***
+Suite Setup    Run Tests    --test timeoutedkeywordpasses     
core/timeouts.txt
+Resource  atest_resource.txt
+Force Tags   pybot    jybot    regression
+
+*** Test Cases ***
+Keyword timeout is written to XML
+    ${output} =  Get File  ${OUTFILE}
+    Should Contain    ${output}    timeout="5 seconds"
+
=======================================
--- /src/robot/running/keywords.py      Sun Feb  6 01:24:10 2011
+++ /src/robot/running/keywords.py      Tue Jun 28 12:57:14 2011
@@ -87,6 +87,7 @@
         handler.init_keyword(context.get_current_vars())
         self.name = self._get_name(handler.longname)
         self.doc = handler.shortdoc
+        self.timeout = getattr(handler, 'timeout', '')
         self.starttime = utils.get_timestamp()
         context.start_keyword(self)
         if self.doc.startswith('*DEPRECATED*'):

==============================================================================
Revision: d9387bc5e88c
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 28 12:57:56 2011
Log:      Read and render keyword timeout in log.html

Update issue 891
Status: Done
http://code.google.com/p/robotframework/source/detail?r=d9387bc5e88c

Modified:
 /src/robot/webcontent/log.html
 /src/robot/webcontent/model.js
 /src/robot/webcontent/testdata.js

=======================================
--- /src/robot/webcontent/log.html      Mon Jun 27 05:04:42 2011
+++ /src/robot/webcontent/log.html      Tue Jun 28 12:57:56 2011
@@ -318,6 +318,12 @@
               <td>{{html doc()}}</td>
             </tr>
             {{/if}}
+            {{if timeout}}
+            <tr>
+              <th>Timeout:</th>
+              <td>${timeout}</td>
+            </tr>
+            {{/if}}
             <tr>
               <th>Start / End / Elapsed:</th>
               <td>${times.startTime}  /  ${times.endTime}  /   
${times.elapsedTime}</td>
=======================================
--- /src/robot/webcontent/model.js      Wed Jun 22 12:53:41 2011
+++ /src/robot/webcontent/model.js      Tue Jun 28 12:57:56 2011
@@ -141,6 +141,7 @@
         var parentPath = (parent.path === undefined) ? parent.fullName :  
parent.path;
         kw.path = parentPath + "." + data.index;
         kw.arguments = data.args;
+        kw.timeout = data.timeout;
         kw.populateKeywords = createIterablePopulator("Keyword");
         kw.populateMessages = createIterablePopulator("Message");
         kw.children = function () {
=======================================
--- /src/robot/webcontent/testdata.js   Mon Jun 27 05:04:42 2011
+++ /src/robot/webcontent/testdata.js   Tue Jun 28 12:57:56 2011
@@ -65,6 +65,7 @@
         var kw = model.Keyword({
             type: KEYWORD_TYPE[get(element[0])],
             name: get(element[1]),
+            timeout: get(element[2]),
             args: get(element[4]),
             doc: function () {
                 var val = get(element[3]);