Use test uid from record

Author: jonny12375

openhtf/core/test_record.py

@@ -186,6 +186,7 @@ class TestRecord(object):
   diagnoses = attr.ib(type=List['diagnoses_lib.Diagnosis'], factory=list)
   log_records = attr.ib(type=List[logs.LogRecord], factory=list)
   marginal = attr.ib(type=Optional[bool], default=None)
+  test_uid = attr.ib(type=Optional[Text], default=None)
 
   # Cache fields to reduce repeated base type conversions.
   _cached_record = attr.ib(type=Dict[Text, Any], factory=dict)
@@ -266,6 +267,7 @@ def as_base_types(self) -> Dict[Text, Any]:
         'diagnosers': self._cached_diagnosers,
         'diagnoses': self._cached_diagnoses,
         'log_records': self._cached_log_records,
+        'test_uid': self.test_uid,
     }
     ret.update(self._cached_record)
     return ret

openhtf/core/test_state.py

@@ -148,7 +148,8 @@ def __init__(self, test_desc: 'test_descriptor.TestDescriptor',
         start_time_millis=0,
         # Copy metadata so we don't modify test_desc.
         metadata=copy.deepcopy(test_desc.metadata),
-        diagnosers=test_options.diagnosers)
+        diagnosers=test_options.diagnosers,
+        test_uid=execution_uid)
     logs.initialize_record_handler(execution_uid, self.test_record,
                                    self.notify_update)
     self.state_logger = logs.get_record_logger_for(execution_uid)

openhtf/output/servers/station_server.py

@@ -273,14 +273,13 @@ class StationPubSub(pub_sub.PubSub):
   """
   _lock = threading.Lock()  # Required by pub_sub.PubSub.
   subscribers = set()  # Required by pub_sub.PubSub.
-  _last_execution_uid = None
   _last_message = None
 
   @classmethod
   def publish_test_record(cls, test_record):
     test_record_dict = data.convert_to_base_types(test_record)
     test_state_dict = _test_state_from_record(test_record_dict,
-                                              cls._last_execution_uid)
+                                              test_record.test_uid)
     cls._publish_test_state(test_state_dict, 'record')
 
   @classmethod
@@ -296,7 +295,6 @@ def _publish_test_state(cls, test_state_dict, message_type):
         'type': message_type,
     }
     super(StationPubSub, cls).publish(message)
-    cls._last_execution_uid = test_state_dict['execution_uid']
     cls._last_message = message
 
   def on_subscribe(self, info):

test/test_state_test.py

@@ -96,6 +96,7 @@ def test_phase():
         'diagnosers': [],
         'diagnoses': [],
         'log_records': [],
+        'test_uid': 'testing-123',
     },
     'plugs': {
         'plug_descriptors': {},