[robotframework] 2 new revisions pushed by janne.t.harkonen on 2011-06-21 08:34 GMT

[robotframework]

2 new revisions:

Revision: 4b2b95de111a
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 21 01:33:55 2011
Log:      removed unnecessary TODO
http://code.google.com/p/robotframework/source/detail?r=4b2b95de111a
Revision: 5f0968ecdf79
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 21 01:34:01 2011
Log:      cleanup
http://code.google.com/p/robotframework/source/detail?r=5f0968ecdf79

==============================================================================
Revision: 4b2b95de111a
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 21 01:33:55 2011
Log:      removed unnecessary TODO
http://code.google.com/p/robotframework/source/detail?r=4b2b95de111a

Modified:
 /src/robot/webcontent/model.js

=======================================
--- /src/robot/webcontent/model.js      Tue Jun 21 01:25:23 2011
+++ /src/robot/webcontent/model.js      Tue Jun 21 01:33:55 2011
@@ -131,9 +131,6 @@
         test.isCritical = data.isCritical;
         test.tags = data.tags;
         test.message = data.message;
-        // TODO: Handle failures in parent teardowns
-        // data.status.parentSuiteTeardownFailed;
-        // return "Teardown of the parent suite failed.";
         return test;
     }


==============================================================================
Revision: 5f0968ecdf79
Author:   Janne Härkönen <j...@reaktor.fi>
Date:     Tue Jun 21 01:34:01 2011
Log:      cleanup
http://code.google.com/p/robotframework/source/detail?r=5f0968ecdf79

Modified:
 /src/robot/webcontent/testdata.js

=======================================
--- /src/robot/webcontent/testdata.js   Tue Jun 21 00:56:46 2011
+++ /src/robot/webcontent/testdata.js   Tue Jun 21 01:34:01 2011
@@ -114,15 +114,12 @@
     }

     function createMessage(statusElement, hasSuiteTeardownFailed) {
-        var message = '';
-        if (statusElement.length == 4)
-            message = get(statusElement[3]);
-        if(hasSuiteTeardownFailed)
-            if(message === '')
-                return 'Teardown of the parent suite failed.';
-            else
-                message += '\n\nAlso teardown of the parent suite failed.'
-        return message;
+        var message = statusElement.length == 4 ?  
get(statusElement[3]) : '';
+        if (!hasSuiteTeardownFailed)
+            return message;
+        if (message)
+            return message + '\n\nAlso teardown of the parent suite  
failed.';
+        return 'Teardown of the parent suite failed.';
     }

     function createSuite(parent, element) {