2 new revisions:

Revision: 36982b3e20a4
Author:   Jussi Malinen
Date:     Wed Jul 13 01:00:02 2011
Log:      fixed TestSuite public api
http://code.google.com/p/robotframework/source/detail?r=36982b3e20a4

Revision: 9cc66e32d699
Author:   Jussi Malinen
Date:     Wed Jul 13 01:01:00 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=9cc66e32d699

==============================================================================
Revision: 36982b3e20a4
Author:   Jussi Malinen
Date:     Wed Jul 13 01:00:02 2011
Log:      fixed TestSuite public api
http://code.google.com/p/robotframework/source/detail?r=36982b3e20a4

Modified:
 /src/robot/output/__init__.py

=======================================
--- /src/robot/output/__init__.py       Wed Jun 15 09:24:29 2011
+++ /src/robot/output/__init__.py       Wed Jul 13 01:00:02 2011
@@ -12,7 +12,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.

-
 from output import Output
 from logger import LOGGER
 from monitor import CommandLineMonitor
@@ -20,6 +19,8 @@
 from loggerhelper import LEVELS, Message
 from readers import process_output, process_outputs

+from robot.result.resultwriter import ResultFromXML
+

 # Hooks to output. Set by Output.
 # Use only if no other way available (e.g. from BuiltIn library)
@@ -39,12 +40,11 @@
         If path is not given the suite is written into the same file as it
         originally was read from.
         """
-        from robot.result import RobotTestOutput
         if path is None:
             path = outpath
         suite.set_status()
-        testoutput = RobotTestOutput(suite, errors)
-        testoutput.serialize_output(path, suite)
+        testoutput = ResultFromXML(suite, errors)
+        testoutput.serialize_output(path)

     suite.write_to_file = write_to_file
     return suite

==============================================================================
Revision: 9cc66e32d699
Author:   Jussi Malinen
Date:     Wed Jul 13 01:01:00 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=9cc66e32d699


Reply via email to