2 new revisions:
Revision: 25e2c35e1a58
Author: Mikko Korpela <[email protected]>
Date: Fri Nov 4 02:20:11 2011
Log: test cleanup
http://code.google.com/p/robotframework/source/detail?r=25e2c35e1a58
Revision: 03193485e776
Author: Mikko Korpela <[email protected]>
Date: Fri Nov 4 02:20:17 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=03193485e776
==============================================================================
Revision: 25e2c35e1a58
Author: Mikko Korpela <[email protected]>
Date: Fri Nov 4 02:20:11 2011
Log: test cleanup
http://code.google.com/p/robotframework/source/detail?r=25e2c35e1a58
Modified:
/utest/reporting/test_js_serializer.py
/utest/result/test_resultbuilder.py
/utest/result/test_resultserializer.py
=======================================
--- /utest/reporting/test_js_serializer.py Mon Oct 24 03:12:31 2011
+++ /utest/reporting/test_js_serializer.py Fri Nov 4 02:20:11 2011
@@ -4,10 +4,10 @@
import os
import unittest
-from robot.output.loggerhelper import Message
from robot.output.xmllogger import XmlLogger
from robot.reporting.outputparser import OutputParser,
CombiningOutputParser
+from robot.result.model import Message
from robot.utils.abstractxmlwriter import AbstractXmlWriter
from robot.utils.asserts import assert_equals, assert_true
=======================================
--- /utest/result/test_resultbuilder.py Thu Nov 3 06:32:20 2011
+++ /utest/result/test_resultbuilder.py Fri Nov 4 02:20:11 2011
@@ -8,15 +8,13 @@
from robot.result.builders import ResultFromXML
from robot.utils.asserts import assert_equals, assert_true, assert_raises
-
-with open(join(dirname(__file__), 'golden.xml')) as f:
- GOLDEN_XML = f.read()
-
-with open(join(dirname(__file__), 'goldenTwice.xml')) as f:
- GOLDEN_XML_TWICE = f.read()
-
-with open(join(dirname(__file__), 'suite_teardown_failed.xml')) as f:
- SUITE_TEARDOWN_FAILED = f.read()
+def _read_file(name):
+ with open(join(dirname(__file__), name)) as f:
+ return f.read()
+
+GOLDEN_XML = _read_file('golden.xml')
+GOLDEN_XML_TWICE = _read_file('goldenTwice.xml')
+SUITE_TEARDOWN_FAILED = _read_file('suite_teardown_failed.xml')
class TestBuildingSuiteExecutionResult(unittest.TestCase):
=======================================
--- /utest/result/test_resultserializer.py Fri Oct 28 03:38:19 2011
+++ /utest/result/test_resultserializer.py Fri Nov 4 02:20:11 2011
@@ -4,9 +4,8 @@
from xml.etree.ElementTree import XML
from xml.etree.ElementTree import tostring
-from robot.result.builders import ResultFromXML, ExecutionResultBuilder
+from robot.result.builders import ResultFromXML
from robot.result.serializer import ResultSerializer
-from robot.result.model import ExecutionResult
from robot.utils.asserts import assert_equals
from test_resultbuilder import GOLDEN_XML, GOLDEN_XML_TWICE
==============================================================================
Revision: 03193485e776
Author: Mikko Korpela <[email protected]>
Date: Fri Nov 4 02:20:17 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=03193485e776
