4 new revisions:
Revision: e550021b12f3
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 01:24:13 2013
Log: Always generate autodocs and override manual changes
http://code.google.com/p/robotframework/source/detail?r=e550021b12f3
Revision: 5135187bea4e
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 01:26:05 2013
Log: API doc generation script: Changed info tests
http://code.google.com/p/robotframework/source/detail?r=5135187bea4e
Revision: 8a30456afaf3
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 02:05:11 2013
Log: Using attribute documentation syntax instead of ivars....
http://code.google.com/p/robotframework/source/detail?r=8a30456afaf3
Revision: 51e45896daf5
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 02:05:52 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=51e45896daf5
==============================================================================
Revision: e550021b12f3
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 01:24:13 2013
Log: Always generate autodocs and override manual changes
http://code.google.com/p/robotframework/source/detail?r=e550021b12f3
Modified:
/doc/api/autodoc/robot.libraries.rst
/doc/api/generate.py
=======================================
--- /doc/api/autodoc/robot.libraries.rst Tue Jun 4 02:40:03 2013
+++ /doc/api/autodoc/robot.libraries.rst Tue Jun 11 01:24:13 2013
@@ -120,3 +120,28 @@
:members:
:undoc-members:
:show-inheritance:
+
+:mod:`dialogs_ipy` Module
+-------------------------
+
+.. automodule:: robot.libraries.dialogs_ipy
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`dialogs_jy` Module
+------------------------
+
+.. automodule:: robot.libraries.dialogs_jy
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`dialogs_py` Module
+------------------------
+
+.. automodule:: robot.libraries.dialogs_py
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
=======================================
--- /doc/api/generate.py Tue Jun 4 05:47:28 2013
+++ /doc/api/generate.py Tue Jun 11 01:24:13 2013
@@ -24,8 +24,7 @@
self.options = GeneratorOptions()
def run(self):
- if self.options.autodoc:
- self.create_autodoc()
+ self.create_autodoc()
if self.options.javadoc:
self.create_javadoc()
orig_dir = abspath(os.curdir)
@@ -70,26 +69,14 @@
self._parser = OptionParser(self.usage)
self._add_options()
self._options, _ = self._parser.parse_args()
- if not self._options._autodoc:
- self._prompt_for_regeneration('autodoc')
if not self._options._javadoc:
self._prompt_for_regeneration('javadoc')
- @property
- def autodoc(self):
- return self._options._autodoc
-
@property
def javadoc(self):
return self._options._javadoc
def _add_options(self):
- self._parser.add_option('-a', '--autodoc',
- action='store_true',
- dest='_autodoc',
- help='Regenerates Autodoc'
- )
-
self._parser.add_option('-j', '--javadoc',
action='store_true',
dest='_javadoc',
@@ -97,7 +84,7 @@
)
def _prompt_for_regeneration(self, attr_name):
- selection = raw_input('Regenerate %s? This overrides manual
changes. '
+ selection = raw_input('Regenerate also %s? '
'[Y/N] (N by default) > ' % attr_name.title())
if len(selection) > 0 and selection[0].lower() == 'y':
setattr(self._options, '_%s' % attr_name, True)
==============================================================================
Revision: 5135187bea4e
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 01:26:05 2013
Log: API doc generation script: Changed info tests
http://code.google.com/p/robotframework/source/detail?r=5135187bea4e
Modified:
/doc/api/generate.py
=======================================
--- /doc/api/generate.py Tue Jun 11 01:24:13 2013
+++ /doc/api/generate.py Tue Jun 11 01:26:05 2013
@@ -36,13 +36,13 @@
def create_autodoc(self):
self._clean_directory(self.AUTODOC_DIR)
- print 'Regenearting autodoc'
+ print 'Genearting autodoc'
call(['sphinx-apidoc', '--output-dir', self.AUTODOC_DIR, '--force',
'--no-toc', '--maxdepth', '2', self.ROBOT_DIR])
def create_javadoc(self):
self._clean_directory(self.JAVA_TARGET)
- print 'Regenerating javadoc'
+ print 'Generating javadoc'
call(['javadoc', '-sourcepath', self.JAVA_SRC, '-d',
self.JAVA_TARGET,
'-notimestamp', 'org.robotframework'])
@@ -70,7 +70,7 @@
self._add_options()
self._options, _ = self._parser.parse_args()
if not self._options._javadoc:
- self._prompt_for_regeneration('javadoc')
+ self._prompt_for_generation('javadoc')
@property
def javadoc(self):
@@ -80,11 +80,11 @@
self._parser.add_option('-j', '--javadoc',
action='store_true',
dest='_javadoc',
- help='Regenerates Javadoc'
+ help='Generates Javadoc'
)
- def _prompt_for_regeneration(self, attr_name):
- selection = raw_input('Regenerate also %s? '
+ def _prompt_for_generation(self, attr_name):
+ selection = raw_input('Generate also %s? '
'[Y/N] (N by default) > ' % attr_name.title())
if len(selection) > 0 and selection[0].lower() == 'y':
setattr(self._options, '_%s' % attr_name, True)
==============================================================================
Revision: 8a30456afaf3
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 02:05:11 2013
Log: Using attribute documentation syntax instead of ivars.
Update issue 1468
API documentation now uses #: convention instead of :ivar convention.
http://code.google.com/p/robotframework/source/detail?r=8a30456afaf3
Modified:
/src/robot/model/keyword.py
/src/robot/model/message.py
/src/robot/model/statistics.py
/src/robot/model/stats.py
/src/robot/model/suitestatistics.py
/src/robot/model/tagstatistics.py
/src/robot/model/testcase.py
/src/robot/model/testsuite.py
/src/robot/model/totalstatistics.py
/src/robot/result/executionerrors.py
/src/robot/result/executionresult.py
/src/robot/result/keyword.py
/src/robot/result/testcase.py
/src/robot/result/testsuite.py
/src/robot/running/model.py
=======================================
--- /src/robot/model/keyword.py Thu Jun 6 07:00:44 2013
+++ /src/robot/model/keyword.py Tue Jun 11 02:05:11 2013
@@ -20,6 +20,8 @@
class Keyword(ModelObject):
+ """Base model for single keyword.
+ """
__slots__ = ['parent', 'name', 'doc', 'args', 'type', 'timeout']
KEYWORD_TYPE = 'kw'
SETUP_TYPE = 'setup'
@@ -30,14 +32,17 @@
message_class = Message
def __init__(self, name='', doc='', args=(), type='kw', timeout=None):
- self.parent = None
- self.name = name
- self.doc = doc
- self.args = args
- self.type = type
- self.timeout = timeout
- self.messages = []
- self.keywords = []
+ self.parent = None #: :class:`~.testsuite.TestSuite` or
+ #: :class:`~.testcase.TestCase` that
contains this keyword.
+ self.name = name #: Keyword name.
+ self.doc = doc #: Keyword documentation.
+ self.args = args #: Keyword arguments, a list of strings.
+ self.type = type #: 'SETUP', 'TEARDOWN' or 'KW'.
+ self.timeout = timeout #: Keyword timeout.
+ self.messages = [] #: Keyword messages, a list of
+ #: :class:`~robot.model.message.Messages`
instances.
+ self.keywords = [] #: Child keyword results, a list of
+ #: :class:`~.Keyword`. instances
@setter
def keywords(self, keywords):
=======================================
--- /src/robot/model/message.py Mon Jun 10 07:17:04 2013
+++ /src/robot/model/message.py Tue Jun 11 02:05:11 2013
@@ -23,23 +23,17 @@
The message can be a log message triggered by a keyword, or a warning
or an error occurred during the test execution.
-
- :ivar message: The message content as a string.
- :ivar level: Severity of the message. Either ``TRACE``, ``INFO``,
- ``WARN``, ``DEBUG`` or ``FAIL``/``ERROR``.
- :ivar html: ``True`` if the content is in HTML, ``False`` otherwise.
- :ivar timestamp: Timestamp in format ``%Y%m%d %H:%M:%S.%f``.
- :ivar parent: The object this message was triggered by.
"""
__slots__ = ['message', 'level', 'html', 'timestamp', 'parent']
def __init__(self, message='', level='INFO', html=False,
timestamp=None,
parent=None):
- self.message = message
- self.level = level
- self.html = html
- self.timestamp = timestamp
- self.parent = parent
+ self.message = message #: The message content as a string.
+ self.level = level #: Severity of the message. Either
``TRACE``, ``INFO``,
+ #: ``WARN``, ``DEBUG`` or
``FAIL``/``ERROR``.
+ self.html = html #: ``True`` if the content is in HTML,
``False`` otherwise.
+ self.timestamp = timestamp #: Timestamp in format
``%Y%m%d %H:%M:%S.%f``.
+ self.parent = parent #: The object this message was triggered
by.
@property
def html_message(self):
=======================================
--- /src/robot/model/statistics.py Mon Jun 10 07:17:04 2013
+++ /src/robot/model/statistics.py Tue Jun 11 02:05:11 2013
@@ -23,12 +23,7 @@
Accepted parameters have the same semantics as the matching command
line
options.
-
- :ivar total: Instance
of :class:`~robot.model.totalstatistics.TotalStatistics`.
- :ivar suite: Instance
of :class:`~robot.model.suitestatistics.SuiteStatistics`.
- :ivar tags: Instance
of :class:`~robot.model.tagstatistics.TagStatistics`.
"""
-
def __init__(self, suite, suite_stat_level=-1, tag_stat_include=None,
tag_stat_exclude=None, tag_stat_combine=None,
tag_doc=None,
tag_stat_link=None):
@@ -38,9 +33,9 @@
tag_stat_exclude,
tag_stat_combine,
tag_doc, tag_stat_link)
suite.visit(StatisticsBuilder(total_builder, suite_builder,
tag_builder))
- self.total = total_builder.stats
- self.suite = suite_builder.stats
- self.tags = tag_builder.stats
+ self.total = total_builder.stats #: Instance
of :class:`~robot.model.totalstatistics.TotalStatistics`.
+ self.suite = suite_builder.stats #: Instance
of :class:`~robot.model.suitestatistics.SuiteStatistics`.
+ self.tags = tag_builder.stats #: Instance
of :class:`~robot.model.tagstatistics.TagStatistics`.
def visit(self, visitor):
visitor.visit_statistics(self)
=======================================
--- /src/robot/model/stats.py Mon Jun 10 07:17:04 2013
+++ /src/robot/model/stats.py Tue Jun 11 02:05:11 2013
@@ -19,24 +19,19 @@
class Stat(object):
"""Generic statistic object used for storing all the statistic values.
-
- :ivar name: Human readable identifier of the object these statistics
- belong to. Either `All Tests` or `Critical Tests` for
- :class:`~robot.model.totalstatistics.TotalStatistics`,
- long name of the suite for
- :class:`~robot.model.suitestatistics.SuiteStatistics`
- or name of the tag for
- :class:`~robot.model.tagstatistics.TagStatistics`
- :ivar passed: Number of passed tests.
- :ivar failed: Number of failed tests.
- :ivar elapsed: Number of milliseconds it took to execute.
"""
def __init__(self, name):
- self.name = name
- self.passed = 0
- self.failed = 0
- self.elapsed = 0
+ self.name = name #: Human readable identifier of the object these
statistics
+ #: belong to. Either `All Tests` or `Critical
Tests` for
+
#: :class:`~robot.model.totalstatistics.TotalStatistics`,
+ #: long name of the suite for
+
#: :class:`~robot.model.suitestatistics.SuiteStatistics`
+ #: or name of the tag for
+
#: :class:`~robot.model.tagstatistics.TagStatistics`
+ self.passed = 0 #: Number of passed tests.
+ self.failed = 0 #: Number of failed tests.
+ self.elapsed = 0 #: Number of milliseconds it took to execute.
self._norm_name = normalize(name, ignore='_')
def get_attributes(self, include_label=False, include_elapsed=False,
@@ -92,26 +87,20 @@
class TotalStat(Stat):
"""Stores statistic values for a test run.
-
- :ivar type: Always string `total`.
"""
- type = 'total'
+ type = 'total' #: Always string `total`
class SuiteStat(Stat):
"""Stores statistics values for a single suite.
-
- :ivar id: Identifier of the suite, e.g. `s1-s2`.
- :ivar elapsed: Number of milliseconds it took to execute this suite,
- including sub-suites.
- :ivar type: Always string `suite`
"""
- type = 'suite'
+ type = 'suite' #: Always string `suite`
def __init__(self, suite):
Stat.__init__(self, suite.longname)
- self.id = suite.id
- self.elapsed = suite.elapsedtime
+ self.id = suite.id #: Identifier of the suite, e.g.
`s1-s2`.
+ self.elapsed = suite.elapsedtime #: Number of milliseconds it
took to execute this suite,
+ #: including sub-suites.
self._name = suite.name
def _get_custom_attrs(self):
@@ -127,27 +116,20 @@
class TagStat(Stat):
"""Stores statistic values for a single tag.
-
- :ivar doc: Documentation of tag as a string.
- :ivar links: List of tuples in which the first value is the link URL
and
- the second is the link title. An empty list by default.
- :ivar critical: ``True`` if tag is considered critical, ``False``
otherwise.
- :ivar non_critical: ``True`` if tag is considered non-critical,
``False``
- otherwise.
- :ivar combined: Pattern as a string if the tag is combined, an empty
string
- otherwise.
- :ivar type: Always string `tag`.
"""
- type = 'tag'
+ type = 'tag' #: Always string `tag`.
def __init__(self, name, doc='', links=None, critical=False,
non_critical=False, combined=''):
Stat.__init__(self, name)
- self.doc = doc
- self.links = links or []
- self.critical = critical
- self.non_critical = non_critical
- self.combined = combined
+ self.doc = doc #: Documentation of tag as a
string.
+ self.links = links or [] #: List of tuples in which the
first value is the link URL and
+ #: the second is the link title.
An empty list by default.
+ self.critical = critical #: ``True`` if tag is considered
critical, ``False`` otherwise.
+ self.non_critical = non_critical #: ``True`` if tag is considered
non-critical,
+ #: ``False`` otherwise.
+ self.combined = combined #: Pattern as a string if the
tag is combined,
+ #: an empty string otherwise.
@property
def info(self):
=======================================
--- /src/robot/model/suitestatistics.py Mon Jun 10 07:17:04 2013
+++ /src/robot/model/suitestatistics.py Tue Jun 11 02:05:11 2013
@@ -17,14 +17,11 @@
class SuiteStatistics(object):
"""Container for suite statistics.
-
- :ivar stat: Instance of :class:`~robot.model.stats.SuiteStat`.
- :ivar suites: List of :class:`~robot.model.testsuite.TestSuite`
objects.
"""
def __init__(self, suite):
- self.stat = SuiteStat(suite)
- self.suites = []
+ self.stat = SuiteStat(suite) #: Instance
of :class:`~robot.model.stats.SuiteStat`.
+ self.suites = [] #: List
of :class:`~robot.model.testsuite.TestSuite` objects.
def visit(self, visitor):
visitor.visit_suite_statistics(self)
=======================================
--- /src/robot/model/tagstatistics.py Mon Jun 10 07:17:04 2013
+++ /src/robot/model/tagstatistics.py Tue Jun 11 02:05:11 2013
@@ -23,18 +23,15 @@
class TagStatistics(object):
"""Container for tag statistics.
-
- :ivar tags: Dictionary, where key is the name of the tag
- as a string and value is an instance of
- :class:`~robot.model.stats.TagStat`.
- :ivar combined: Dictionary, where key is the name
- of the created tag as a string and value is an
instance of
- :class:`~robot.model.stats.TagStat`.
"""
def __init__(self, combined_stats):
- self.tags = NormalizedDict(ignore=['_'])
- self.combined = combined_stats
+ self.tags = NormalizedDict(ignore=['_']) #: Dictionary, where key
is the name of the tag
+ #: as a string and value
is an instance of
+
#: :class:`~robot.model.stats.TagStat`.
+ self.combined = combined_stats #: Dictionary, where key
is the name
+ #: of the created tag as
a string and value is an instance of
+
#: :class:`~robot.model.stats.TagStat`.
def visit(self, visitor):
visitor.visit_tag_statistics(self)
=======================================
--- /src/robot/model/testcase.py Sat Jun 8 02:14:24 2013
+++ /src/robot/model/testcase.py Tue Jun 11 02:05:11 2013
@@ -21,23 +21,19 @@
class TestCase(ModelObject):
+ """Base model for single test case.
+ """
__slots__ = ['parent', 'name', 'doc', 'timeout']
keyword_class = Keyword
def __init__(self, name='', doc='', tags=None, timeout=None):
- """Model for single test suite.
-
- :param name: Test suite name.
- :param doc: Test suite documentation.
- :param tags: Test suite tags.
- :param timeout: Timeout for test suite.
- """
- self.parent = None
- self.name = name
- self.doc = doc
- self.tags = tags
- self.timeout = timeout
- self.keywords = []
+ self.parent = None #: :class:`~.testsuite.TestSuite` that
contains this test.
+ self.name = name #: Test case name.
+ self.doc = doc #: Test case documentation.
+ self.tags = tags #: Test case tags, a list of strings.
+ self.timeout = timeout #: Test case timeout.
+ self.keywords = [] #: Keyword results, a list
of :class:`~.keyword.Keyword`.
+ #: instances and contains also possible
setup and teardown keywords.
@setter
def tags(self, tags):
=======================================
--- /src/robot/model/testsuite.py Mon Jun 10 10:22:16 2013
+++ /src/robot/model/testsuite.py Tue Jun 11 02:05:11 2013
@@ -25,22 +25,24 @@
class TestSuite(ModelObject):
+ """Base model for single suite.
+ """
__slots__ = ['parent', 'source', '_name', 'doc', '_my_visitors']
test_class = TestCase
keyword_class = Keyword
def __init__(self, name='', doc='', metadata=None, source=None):
- self.parent = None
- self.name = name
- self.doc = doc
- self.metadata = metadata
- self.source = source
- self.suites = []
- self.tests = []
- self.keywords = []
+ self.parent = None #: Parent :class:`TestSuite` or `None`.
+ self.name = name #: Test suite name.
+ self.doc = doc #: Test suite documentation.
+ self.metadata = metadata #: Test suite metadata as a dictionary.
+ self.source = source #: Path to the source file or directory.
+ self.suites = [] #: A list of
child :class:`~.testsuite.TestSuite` instances.
+ self.tests = [] #: A list
of :class:`~.testcase.TestCase` instances.
+ self.keywords = [] #: A list containing setup and teardown
as
+ #: :class:`~keyword.Keyword` instances.
self._my_visitors = []
-
@property
def _visitors(self):
parent_visitors = self.parent._visitors if self.parent else []
=======================================
--- /src/robot/model/totalstatistics.py Mon Jun 10 10:22:16 2013
+++ /src/robot/model/totalstatistics.py Tue Jun 11 02:05:11 2013
@@ -18,16 +18,13 @@
class TotalStatistics(object):
"""Container for total statistics.
-
- :ivar critical: Instance of :class:`~robot.model.stats.TotalStat` for
- critical tests.
- :ivar all: Instance of :class:`~robot.model.stats.TotalStat` for
- all the tests.
"""
def __init__(self):
- self.critical = TotalStat('Critical Tests')
- self.all = TotalStat('All Tests')
+ self.critical = TotalStat('Critical Tests') #: Instance
of :class:`~robot.model.stats.TotalStat` for
+ #: critical tests.
+ self.all = TotalStat('All Tests') #: Instance
of :class:`~robot.model.stats.TotalStat` for
+ #: all the tests.
def visit(self, visitor):
visitor.visit_total_statistics(self)
=======================================
--- /src/robot/result/executionerrors.py Mon Jun 10 07:17:04 2013
+++ /src/robot/result/executionerrors.py Tue Jun 11 02:05:11 2013
@@ -22,14 +22,12 @@
"""Represents errors occurred during the execution of tests.
An error might be, for example, that importing a library has failed.
-
- :ivar messages: A list-like object
of :class:`~robot.model.message.Message`
- instances.
"""
message_class = Message
def __init__(self, messages=None):
- self.messages = messages
+ self.messages = messages #: A list-like object
of :class:`~robot.model.message.Message`
+ #: instances.
@setter
def messages(self, msgs):
=======================================
--- /src/robot/result/executionresult.py Fri Jun 7 11:48:41 2013
+++ /src/robot/result/executionresult.py Tue Jun 11 02:05:11 2013
@@ -26,18 +26,14 @@
Can be created based on XML output files using
the :func:`~.resultbuilder.ExecutionResult` factory method.
Also returned by executed :class:`~robot.running.model.TestSuite`.
-
- :ivar source: Path to the XML file where results are read from.
- :ivar suite: Hierarchical execution results as
- a :class:`~.testsuite.TestSuite` object.
- :ivar errors: Execution errors as
- an :class:`~.executionerrors.ExecutionErrors` object.
"""
def __init__(self, source=None, root_suite=None, errors=None):
- self.source = source
- self.suite = root_suite or TestSuite()
- self.errors = errors or ExecutionErrors()
+ self.source = source #: Path to the XML file
where results are read from.
+ self.suite = root_suite or TestSuite() #: Hierarchical
execution results as
+ #:
a :class:`~.testsuite.TestSuite` object.
+ self.errors = errors or ExecutionErrors() #: Execution errors as
an
+
#: :class:`~.executionerrors.ExecutionErrors` object.
self.generated_by_robot = True
self._status_rc = True
self._stat_config = {}
=======================================
--- /src/robot/result/keyword.py Thu Jun 6 07:00:44 2013
+++ /src/robot/result/keyword.py Tue Jun 11 02:05:11 2013
@@ -24,32 +24,22 @@
def __init__(self, name='', doc='', args=(), type='kw', timeout='',
status='FAIL', starttime=None, endtime=None):
"""Results of a single keyword.
-
- :ivar name: Keyword name.
- :ivar parent: :class:`~.testsuite.TestSuite` or
- :class:`~.testcase.TestCase` that contains this keyword.
- :ivar doc: Keyword documentation.
- :ivar args: Keyword arguments, a list of strings.
- :ivar type: 'SETUP', 'TEARDOWN' or 'KW'.
- :ivar timeout: Keyword timeout.
- :ivar messages: Log messages, a list of :class:`~.message.Message`
- instances.
- :ivar keywords: Child keyword results, a list of
- :class:`~.Keyword`. instances
- :ivar status: String 'PASS' of 'FAIL'.
- :ivar starttime: Keyword execution start time as a timestamp.
- :ivar endtime: Keyword execution end time as a timestamp.
"""
model.Keyword.__init__(self, name, doc, args, type, timeout)
- self.status = status
- self.starttime = starttime
- self.endtime = endtime
- self.message = '' # only used with suite teardowns
+ self.status = status #: String 'PASS' of 'FAIL'.
+ self.starttime = starttime #: Keyword execution start time in
format ``%Y%m%d %H:%M:%S.%f``.
+ self.endtime = endtime #: Keyword execution end time in
format ``%Y%m%d %H:%M:%S.%f``.
+ self.message = '' #: Log messages, a list
of :class:`~.message.Message`
+ #: instances. Only used with suite
teardowns.
@property
def elapsedtime(self):
+ """ Elapsed time in milliseconds.
+ """
return utils.get_elapsed_time(self.starttime, self.endtime)
@property
def passed(self):
+ """ ``True`` if keyword did pass, ``False``otherwise.
+ """
return self.status == 'PASS'
=======================================
--- /src/robot/result/testcase.py Thu Jun 6 13:28:21 2013
+++ /src/robot/result/testcase.py Tue Jun 11 02:05:11 2013
@@ -24,24 +24,12 @@
def __init__(self, name='', doc='', tags=None, timeout=None,
status='FAIL',
message='', starttime=None, endtime=None):
"""Results of a single test case.
-
- :ivar name: Test case name.
- :ivar parent: :class:`~.testsuite.TestSuite` that contains this
test.
- :ivar doc: Test case documentation.
- :ivar tags: Test case tags, a list of strings.
- :ivar timeout: Test case timeout.
- :ivar keywords: Keyword results, a list
of :class:`~.keyword.Keyword`.
- instances and contains also possible setup and teardown
keywords.
- :ivar status: String 'PASS' of 'FAIL'.
- :ivar message: Possible failure message.
- :ivar starttime: Test case execution start time as a timestamp.
- :ivar endtime: Test case execution end time as a timestamp.
"""
model.TestCase.__init__(self, name, doc, tags, timeout)
- self.status = status
- self.message = message
- self.starttime = starttime
- self.endtime = endtime
+ self.status = status #: String 'PASS' of 'FAIL'.
+ self.message = message #: Possible failure message.
+ self.starttime = starttime #: Test case execution start time in
format ``%Y%m%d %H:%M:%S.%f``.
+ self.endtime = endtime #: Test case execution end time in
format ``%Y%m%d %H:%M:%S.%f``.
@property
def elapsedtime(self):
=======================================
--- /src/robot/result/testsuite.py Mon Jun 10 10:22:16 2013
+++ /src/robot/result/testsuite.py Tue Jun 11 02:05:11 2013
@@ -34,21 +34,11 @@
def __init__(self, name='', doc='', metadata=None, source=None,
message='', starttime=None, endtime=None):
"""Result of a single test suite.
-
- :ivar parent: Parent :class:`TestSuite` or `None`.
- :ivar name: Test suite name.
- :ivar doc: Test suite documentation.
- :ivar metadata: Test suite metadata as a dictionary.
- :ivar source: Path to the source file or directory.
- :ivar suites: A list of child :class:`~.testsuite.TestSuite`
instances.
- :ivar tests: A list of :class:`~.testcase.TestCase` instances.
- :ivar keywords: A list containing setup and teardown
- :class:`~.keyword.Keyword` instances.
"""
model.TestSuite.__init__(self, name, doc, metadata, source)
self.message = message #: Suite setup/teardown error message.
- self.starttime = starttime
- self.endtime = endtime
+ self.starttime = starttime #: Suite execution start time in
format ``%Y%m%d %H:%M:%S.%f``.
+ self.endtime = endtime #: Suite execution end time in format
``%Y%m%d %H:%M:%S.%f``.
self._criticality = None
@property
=======================================
--- /src/robot/running/model.py Mon Jun 10 08:02:13 2013
+++ /src/robot/running/model.py Tue Jun 11 02:05:11 2013
@@ -35,14 +35,9 @@
def __init__(self, name='', args=(), assign=(), type='kw'):
"""Running model for single keyword.
-
- :ivar name: Name of the keyword.
- :ivar args: Arguments for the keyword.
- :ivar assign: Variables to be assigned.
- :ivar type: Keyword type. Either 'kw', 'setup', or 'teardown'
"""
model.Keyword.__init__(self, name=name, args=args, type=type)
- self.assign = assign
+ self.assign = assign #: Variables to be assigned.
def is_for_loop(self):
return False
@@ -85,19 +80,15 @@
def __init__(self, name='', doc='', tags=None, timeout=None,
template=None):
"""Running model for single test case.
-
- :ivar name: Name of the test case.
- :ivar doc: Documentation of the test case.
- :ivar tags: Tags of the test case.
- :ivar timeout: Timeout limit of the test case
- :ivar template: Name of the keyword that has been used as template
- when building the test. `None` if no template used.
"""
model.TestCase.__init__(self, name, doc, tags, timeout)
- self.template = template
+ self.template = template #: Name of the keyword that has been
used as template
+ #: when building the test. `None` if no
template used.
@setter
def timeout(self, timeout):
+ """Timeout limit of the test case
+ """
return Timeout(*timeout) if timeout else None
@@ -108,26 +99,13 @@
def __init__(self, name='', doc='', metadata=None, source=None):
"""Running model for single test suite.
-
- :ivar parent: Parent :class:`TestSuite` or `None`.
- :ivar name: Test suite name.
- :ivar doc: Test suite documentation.
- :ivar metadata: Test suite metadata as a dictionary.
- :ivar source: Path to the source file or directory.
- :ivar suites: Child suites.
- :ivar tests: A list of :class:`~.testcase.TestCase` instances.
- :ivar keywords: A list containing setup and teardown as
- :class:`~robot.running.model.Keyword` objects.
- :ivar imports: Imports the suite contains.
- :ivar user_keywords: User keywords defined in the same file as the
- suite. **Likely to change or to be removed.**
- :ivar variables: Variables defined in the same file as the suite.
- **Likely to change or to be removed.**
"""
model.TestSuite.__init__(self, name, doc, metadata, source)
- self.imports = []
- self.user_keywords = []
- self.variables = []
+ self.imports = [] #: Imports the suite contains.
+ self.user_keywords = [] #: User keywords defined in the same file
as the
+ #: suite. **Likely to change or to be
removed.**
+ self.variables = [] #: Variables defined in the same file as
the suite.
+ #: **Likely to change or to be removed.**
@setter
def imports(self, imports):
==============================================================================
Revision: 51e45896daf5
Branch: default
Author: Anssi Syrjäsalo
Date: Tue Jun 11 02:05:52 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=51e45896daf5
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
