Fix testdoc with timeouts

yanne · yanne · commit ef3e50c69479 · 2019-09-03T07:29:37.000+03:00
Also add a test with timeout to testdoc atests
diff --git a/atest/robot/testdoc/testdoc.robot b/atest/robot/testdoc/testdoc.robot
@@ -2,7 +2,7 @@
 Resource      atest_resource.robot
 
 *** Variables ***
-${INPUT 1}      ${DATADIR}${/}misc${/}pass_and_fail.robot
+${INPUT 1}      ${DATADIR}${/}misc${/}normal.robot
 ${INPUT 2}      ${DATADIR}${/}misc${/}suites
 ${INPUT 3}      ${DATADIR}${/}testdoc
 ${OUTFILE}      %{TEMPDIR}/testdoc-output.html
@@ -12,7 +12,7 @@ ${ARGFILE 2}    %{TEMPDIR}/testdoc_argfile_2.txt
 *** Test Cases ***
 One input
     Run TestDoc    ${INPUT 1}
-    Testdoc Should Contain    "name":"Pass And Fail"    "title":"Pass And Fail"    "numberOfTests":2
+    Testdoc Should Contain    "name":"First One"    "title":"Normal"    "numberOfTests":2
     Outfile Should Have Correct Line Separators
     Output Should Contain Outfile
 
@@ -25,7 +25,7 @@ Variables and imports are not processes
 Many inputs
     Run TestDoc    --exclude    t1    --title    Nön-ÄSCII
     ...    ${INPUT 1}    ${INPUT2}    ${INPUT 3}
-    Testdoc Should Contain    "name":"Pass And Fail &amp; Suites &amp; Testdoc"    "title":"Nön-ÄSCII"    "numberOfTests":8
+    Testdoc Should Contain    "name":"Normal &amp; Suites &amp; Testdoc"    "title":"Nön-ÄSCII"    "numberOfTests":7
     Testdoc Should Not Contain    "name":"Suite4 First"
     Outfile Should Have Correct Line Separators
     Output Should Contain Outfile
@@ -37,7 +37,7 @@ Argument file
     ...    ${EMPTY}
     ...    \# I'm a comment and I'm OK! And so are empty rows around me too.
     ...    ${EMPTY}
-    ...    --exclude pass
+    ...    --exclude t2
     Create Argument File    ${ARGFILE 2}
     ...    --title My title!
     ...    ${INPUT 1}
diff --git a/src/robot/testdoc.py b/src/robot/testdoc.py
@@ -258,11 +258,9 @@ def _get_timeout(self, timeout):
         if timeout is None:
             return ''
         try:
-            tout = secs_to_timestr(timestr_to_secs(timeout.value))
+            tout = secs_to_timestr(timestr_to_secs(timeout))
         except ValueError:
-            tout = timeout.value
-        if timeout.message:
-            tout += ' :: ' + timeout.message
+            tout = timeout
         return tout
 
 
diff --git a/utest/testdoc/test_jsonconverter.py b/utest/testdoc/test_jsonconverter.py
@@ -120,7 +120,7 @@ def test_timeout(self):
                      timeout='1 minute 42 seconds')
         test_convert(self.suite['suites'][-2]['tests'][1],
                      name='Test Timeout With Message',
-                     timeout='1 day 2 hours :: The message')
+                     timeout='1 day 2 hours')
         test_convert(self.suite['suites'][-2]['tests'][2],
                      name='Test Timeout With Variable',
                      timeout='${100}')
