3 new revisions:
Revision: 7c195ce507e4
Author: Janne Härkönen <[email protected]>
Date: Tue Mar 6 05:17:30 2012
Log: tools: fixed times2csv
http://code.google.com/p/robotframework/source/detail?r=7c195ce507e4
Revision: 159e7409a4fa
Author: Janne Härkönen <[email protected]>
Date: Tue Mar 6 05:18:29 2012
Log: doc: apidoc improvements
http://code.google.com/p/robotframework/source/detail?r=159e7409a4fa
Revision: 1404afa0f642
Author: Janne Härkönen <[email protected]>
Date: Tue Mar 6 05:18:36 2012
Log: merge
http://code.google.com/p/robotframework/source/detail?r=1404afa0f642
==============================================================================
Revision: 7c195ce507e4
Author: Janne Härkönen <[email protected]>
Date: Tue Mar 6 05:17:30 2012
Log: tools: fixed times2csv
http://code.google.com/p/robotframework/source/detail?r=7c195ce507e4
Modified:
/tools/times2csv/times2csv.py
=======================================
--- /tools/times2csv/times2csv.py Tue Mar 6 00:46:30 2012
+++ /tools/times2csv/times2csv.py Tue Mar 6 05:17:30 2012
@@ -29,22 +29,22 @@
multiple items e.g. like 'suite-test' or 'test-keyword'.
Examples:
-$ times2csv.py output.xml
-$ times2csv.py path/results.xml path2/times.csv
-$ times2csv.py output.xml times.csv test
-$ times2csv.py output.xml times.csv suite-test
+ times2csv.py output.xml
+ times2csv.py path/results.xml path2/times.csv
+ times2csv.py output.xml times.csv test
+ times2csv.py output.xml times.csv suite-test
"""
import sys
import os
import csv
-from robot.output import TestSuite
+from robot.result import ExecutionResult
from robot import utils
def process_file(inpath, outpath, items):
- suite = TestSuite(inpath)
+ suite = ExecutionResult(inpath).suite
outfile = open(outpath, 'wb')
writer = csv.writer(outfile)
writer.writerow(['TYPE', 'NAME', 'STATUS', 'START', 'END', 'ELAPSED',
@@ -56,7 +56,7 @@
if 'suite' in items:
process_item(suite, writer, level, 'Suite')
if 'keyword' in items:
- for kw in suite.setup, suite.teardown:
+ for kw in suite.keywords:
process_keyword(kw, writer, level+1)
for subsuite in suite.suites:
process_suite(subsuite, writer, items, level+1)
@@ -67,7 +67,7 @@
if 'test' in items:
process_item(test, writer, level, 'Test', 'suite' not in items)
if 'keyword' in items:
- for kw in [test.setup] + test.keywords + [test.teardown]:
+ for kw in test.keywords:
process_keyword(kw, writer, level+1)
def process_keyword(kw, writer, level):
@@ -87,7 +87,7 @@
if __name__ == '__main__':
- if not (2 <= len(sys.argv) <= 4) or '--help' in sys.argv:
+ if not (2 <= len(sys.argv) <= 4) or sys.argv[1] in ('--help', '-h'):
print __doc__
sys.exit(1)
inxml = sys.argv[1]
==============================================================================
Revision: 159e7409a4fa
Author: Janne Härkönen <[email protected]>
Date: Tue Mar 6 05:18:29 2012
Log: doc: apidoc improvements
http://code.google.com/p/robotframework/source/detail?r=159e7409a4fa
Modified:
/doc/api/index.rst
/src/robot/writer/datafilewriter.py
=======================================
--- /doc/api/index.rst Wed Nov 9 06:51:16 2011
+++ /doc/api/index.rst Tue Mar 6 05:18:29 2012
@@ -1,20 +1,16 @@
-============================================
-Welcome to Robot Framework API documentation
-============================================
+=================================
+Robot Framework API documentation
+=================================
.. toctree::
:maxdepth: 2
-Robot Framework's most important APIs are documented below.
-
-Model
-=====
-
-.. autoclass:: robot.model.Tags
- :members:
- :undoc-members:
+This document describes the public API of Robot Framework. Installation,
+basic usage and wealth of other topics are covered in the `user guide`__.
+
+__ http://code.google.com/p/robotframework/wiki/UserGuide
Logging
=======
@@ -40,18 +36,18 @@
:inherited-members:
-Serializing data
-================
+Saving data
+===========
.. automodule:: robot.writer
:members:
-.. automodule:: robot.writer.serializer
+.. automodule:: robot.writer.datafilewriter
:members:
-.. autofunction:: robot.writer.writer.FileWriter
+.. autofunction:: robot.writer.datafilewriter.DataFileWriter
Indices and tables
=======================================
--- /src/robot/writer/datafilewriter.py Tue Mar 6 00:46:30 2012
+++ /src/robot/writer/datafilewriter.py Tue Mar 6 05:18:29 2012
@@ -16,14 +16,17 @@
import os
from robot.errors import DataError
+
from .filewriters import FileWriter
class DataFileWriter(object):
- """Writes parsed Robot Framework test data file objects back to
disk."""
+ """Object to write parsed test data file objects back to disk."""
def __init__(self, **options):
- """:param options: used to create
a :py:class:`.WriteConfiguration`."""
+ """:param **options: A :py:class:`.WritingContext` is created based
+ on these.
+ """
self._options = options
def write(self, datafile):
@@ -71,6 +74,7 @@
WriteConfiguration(datafile, format='html') ->
Output file is created from `datafile.source` by stripping
extension and replacing it with `html`.
+
"""
self.datafile = datafile
self.pipe_separated = pipe_separated
==============================================================================
Revision: 1404afa0f642
Author: Janne Härkönen <[email protected]>
Date: Tue Mar 6 05:18:36 2012
Log: merge
http://code.google.com/p/robotframework/source/detail?r=1404afa0f642
