diff options
Diffstat (limited to 'lldb/test/test_results.py')
| -rw-r--r-- | lldb/test/test_results.py | 145 |
1 files changed, 59 insertions, 86 deletions
diff --git a/lldb/test/test_results.py b/lldb/test/test_results.py index 7b3e796111b..52787e91f4d 100644 --- a/lldb/test/test_results.py +++ b/lldb/test/test_results.py @@ -40,6 +40,29 @@ class EventBuilder(object): return (test_class_name, test_name) @staticmethod + def bare_event(event_type): + """Creates an event with default additions, event type and timestamp. + + @param event_type the value set for the "event" key, used + to distinguish events. + + @returns an event dictionary with all default additions, the "event" + key set to the passed in event_type, and the event_time value set to + time.time(). + """ + if EventBuilder.BASE_DICTIONARY is not None: + # Start with a copy of the "always include" entries. + event = dict(EventBuilder.BASE_DICTIONARY) + else: + event = {} + + event.update({ + "event": event_type, + "event_time": time.time() + }) + return event + + @staticmethod def _event_dictionary_common(test, event_type): """Returns an event dictionary setup with values for the given event type. @@ -51,18 +74,12 @@ class EventBuilder(object): """ test_class_name, test_name = EventBuilder._get_test_name_info(test) - if EventBuilder.BASE_DICTIONARY is not None: - # Start with a copy of the "always include" entries. - result = dict(EventBuilder.BASE_DICTIONARY) - else: - result = {} - result.update({ - "event": event_type, + event = EventBuilder.bare_event(event_type) + event.update({ "test_class": test_class_name, "test_name": test_name, - "event_time": time.time() }) - return result + return event @staticmethod def _error_tuple_class(error_tuple): @@ -278,14 +295,6 @@ class EventBuilder(object): """ EventBuilder.BASE_DICTIONARY = dict(entries_dict) - @staticmethod - def base_event(): - """@return the base event dictionary that all events should contain.""" - if EventBuilder.BASE_DICTIONARY is not None: - return dict(EventBuilder.BASE_DICTIONARY) - else: - return None - class ResultsFormatter(object): @@ -312,6 +321,8 @@ class ResultsFormatter(object): # Single call to session start, before parsing any events. formatter.begin_session() + formatter.handle_event({"event":"initialize",...}) + # Zero or more calls specified for events recorded during the test session. # The parallel test runner manages getting results from all the inferior # dotest processes, so from a new format perspective, don't worry about @@ -319,12 +330,12 @@ class ResultsFormatter(object): # sandwiched between a single begin_session()/end_session() pair in the # parallel test runner process/thread. for event in zero_or_more_test_events(): - formatter.process_event(event) + formatter.handle_event(event) - # Single call to session end. Formatters that need all the data before - # they can print a correct result (e.g. xUnit/JUnit), this is where - # the final report can be generated. - formatter.end_session() + # Single call to terminate/wrap-up. Formatters that need all the + # data before they can print a correct result (e.g. xUnit/JUnit), + # this is where the final report can be generated. + formatter.handle_event({"event":"terminate",...}) It is not the formatter's responsibility to close the file_like_object. (i.e. do not close it). @@ -380,32 +391,8 @@ class ResultsFormatter(object): # entirely consistent from the outside. self.lock = threading.Lock() - def begin_session(self): - """Begins a test session. - - All process_event() calls must be sandwiched between - begin_session() and end_session() calls. - - Derived classes may override this but should call this first. - """ - pass - - def end_session(self): - """Ends a test session. - - All process_event() calls must be sandwiched between - begin_session() and end_session() calls. - - All results formatting should be sent to the output - file object by the end of this call. - - Derived classes may override this but should call this after - the dervied class's behavior is complete. - """ - pass - - def process_event(self, test_event): - """Processes the test event for collection into the formatter output. + def handle_event(self, test_event): + """Handles the test event for collection into the formatter output. Derived classes may override this but should call down to this implementation first. @@ -573,17 +560,16 @@ class XunitFormatter(ResultsFormatter): "unexpected_success": self._handle_unexpected_success } - def begin_session(self): - super(XunitFormatter, self).begin_session() - - def process_event(self, test_event): - super(XunitFormatter, self).process_event(test_event) + def handle_event(self, test_event): + super(XunitFormatter, self).handle_event(test_event) event_type = test_event["event"] if event_type is None: return - if event_type == "test_start": + if event_type == "terminate": + self._finish_output() + elif event_type == "test_start": self.track_start_time( test_event["test_class"], test_event["test_name"], @@ -805,7 +791,7 @@ class XunitFormatter(ResultsFormatter): return result - def _end_session_internal(self): + def _finish_output_no_lock(self): """Flushes out the report of test executions to form valid xml output. xUnit output is in XML. The reporting system cannot complete the @@ -850,11 +836,9 @@ class XunitFormatter(ResultsFormatter): # Close off the test suite. self.out_file.write('</testsuite></testsuites>\n') - super(XunitFormatter, self).end_session() - - def end_session(self): + def _finish_output(self): with self.lock: - self._end_session_internal() + self._finish_output_no_lock() class RawPickledFormatter(ResultsFormatter): @@ -875,42 +859,31 @@ class RawPickledFormatter(ResultsFormatter): super(RawPickledFormatter, self).__init__(out_file, options) self.pid = os.getpid() - def begin_session(self): - super(RawPickledFormatter, self).begin_session() - event = EventBuilder.base_event() - if event is None: - event = {} - event.update({ - "event": "session_begin", - "event_time": time.time(), - "pid": self.pid - }) - self.process_event(event) + def handle_event(self, test_event): + super(RawPickledFormatter, self).handle_event(test_event) - def process_event(self, test_event): - super(RawPickledFormatter, self).process_event(test_event) + # Convert initialize/terminate events into job_begin/job_end events. + event_type = test_event["event"] + if event_type is None: + return + + if event_type == "initialize": + test_event["event"] = "job_begin" + elif event_type == "terminate": + test_event["event"] = "job_end" + + # Tack on the pid. + test_event["pid"] = self.pid # Send it as {serialized_length_of_serialized_bytes}#{serialized_bytes} pickled_message = cPickle.dumps(test_event) self.out_file.send( "{}#{}".format(len(pickled_message), pickled_message)) - def end_session(self): - event = EventBuilder.base_event() - if event is None: - event = {} - event.update({ - "event": "session_end", - "event_time": time.time(), - "pid": self.pid - }) - self.process_event(event) - super(RawPickledFormatter, self).end_session() - class DumpFormatter(ResultsFormatter): """Formats events to the file as their raw python dictionary format.""" - def process_event(self, test_event): - super(DumpFormatter, self).process_event(test_event) + def handle_event(self, test_event): + super(DumpFormatter, self).handle_event(test_event) self.out_file.write("\n" + pprint.pformat(test_event) + "\n") |
