2 new revisions:
Revision: de93cec4c5a4
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:34:30 2011
Log: jsondatamodel: set timestamp on creation
http://code.google.com/p/robotframework/source/detail?r=de93cec4c5a4
Revision: 9a9df639038d
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:34:39 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=9a9df639038d
==============================================================================
Revision: de93cec4c5a4
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:34:30 2011
Log: jsondatamodel: set timestamp on creation
http://code.google.com/p/robotframework/source/detail?r=de93cec4c5a4
Modified:
/src/robot/result/elementhandlers.py
/src/robot/result/jsondatamodel.py
/src/robot/result/jsparser.py
/src/robot/result/resultwriter.py
/utest/result/test_js_serializer.py
=======================================
--- /src/robot/result/elementhandlers.py Wed Jun 15 09:24:29 2011
+++ /src/robot/result/elementhandlers.py Wed Jun 15 22:34:30 2011
@@ -243,7 +243,7 @@
def __init__(self):
self._texts = TextCache()
- self._basemillis = None
+ self._basemillis = 0
self._stats = Stats()
self._current_place = []
self._kw_index = []
@@ -273,7 +273,7 @@
if time == 'N/A':
return None
millis = int(utils.timestamp_to_secs(time, millis=True) * 1000)
- if self._basemillis is None:
+ if not self._basemillis:
self._basemillis = millis
return millis - self.basemillis
=======================================
--- /src/robot/result/jsondatamodel.py Wed Jun 15 09:24:29 2011
+++ /src/robot/result/jsondatamodel.py Wed Jun 15 22:34:30 2011
@@ -11,21 +11,29 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
import time
from robot import utils
from elementhandlers import TextIndex
import json
+
class DataModel(object):
def __init__(self, robot_data):
self._robot_data = robot_data
self._settings = None
-
- def set_generated(self, timetuple):
- self._robot_data['generatedMillis'] =
long(time.mktime(timetuple))*1000-self._robot_data['baseMillis']
- self._robot_data['generatedTimestamp'] =
utils.format_time(timetuple, daytimesep=' ', gmtsep=' ')
+ self._set_generated(time.localtime())
+
+ def _set_generated(self, timetuple):
+ millis = time.mktime(timetuple) * 1000 -
self._robot_data['baseMillis']
+ self._set_attr('generatedMillis', millis)
+ self._set_attr('generatedTimestamp',
+ utils.format_time(timetuple, gmtsep=' '))
+
+ def _set_attr(self, name, value):
+ self._robot_data[name] = value
def set_settings(self, settings):
self._settings = settings
=======================================
--- /src/robot/result/jsparser.py Wed Jun 15 10:24:23 2011
+++ /src/robot/result/jsparser.py Wed Jun 15 22:34:30 2011
@@ -18,6 +18,7 @@
from xml import sax
from xml.sax.handler import ContentHandler
+
def create_datamodel_from(input_filename):
robot = _RobotOutputHandler(Context())
with open(input_filename, 'r') as input:
=======================================
--- /src/robot/result/resultwriter.py Wed Jun 15 11:27:11 2011
+++ /src/robot/result/resultwriter.py Wed Jun 15 22:34:30 2011
@@ -14,7 +14,6 @@
import os
import tempfile
-import time
from robot import utils
from robot.common import Statistics
@@ -35,7 +34,6 @@
def write_robot_results(self, data_source):
data_model = jsparser.create_datamodel_from(data_source)
- data_model.set_generated(time.localtime())
LogBuilder(data_model, self._settings).create()
data_model.remove_keywords()
ReportBuilder(data_model, self._settings).create()
=======================================
--- /utest/result/test_js_serializer.py Wed Jun 15 09:24:29 2011
+++ /utest/result/test_js_serializer.py Wed Jun 15 22:34:30 2011
@@ -79,7 +79,7 @@
def test_generated_millis(self):
self._context.timestamp('19790101 12:00:00.000')
data_model = self._get_data_model(self.SUITE_XML)
- data_model.set_generated(time.localtime(284029200))
+ data_model._set_generated(time.localtime(284029200))
assert_equals(data_model._robot_data['generatedMillis'], 0)
def test_tags_xml_parsing(self):
@@ -90,7 +90,7 @@
</tags>
"""
data_model = self._get_data_model(tags_xml)
- self.assert_model(data_model, None, [1, 2],
['*', '*someothertag', '*sometag'])
+ self.assert_model(data_model, 0, [1, 2],
['*', '*someothertag', '*sometag'])
def test_arguments_xml_parsing(self):
arguments_xml = """
@@ -100,7 +100,7 @@
</arguments>
"""
data_model = self._get_data_model(arguments_xml)
- self.assert_model(data_model, None, 1, ['*', '*${arg}, ${level}'])
+ self.assert_model(data_model, 0, 1, ['*', '*${arg}, ${level}'])
def test_keyword_xml_parsing(self):
keyword_xml = """
@@ -163,7 +163,7 @@
<item name="version">alpha</item>
</metadata>"""
data_model = self._get_data_model(meta_xml)
- self.assert_model(data_model, None, {'meta':1, 'version':2},
['*', '*<b>escaped</b>', '*alpha'])
+ self.assert_model(data_model, 0, {'meta':1, 'version':2},
['*', '*<b>escaped</b>', '*alpha'])
def test_statistics_xml_parsing(self):
statistics_xml = """
@@ -184,7 +184,7 @@
</statistics>
"""
data_model = self._get_data_model(statistics_xml)
- self.assert_model(data_model, None,
+ self.assert_model(data_model, 0,
[[['Critical Tests', 0, 4, '', '', ''],
['All Tests', 0, 4, '', '', '']],
[['someothertag', 0, 1, '', '', ''],
==============================================================================
Revision: 9a9df639038d
Author: Janne Härkönen <[email protected]>
Date: Wed Jun 15 22:34:39 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=9a9df639038d
