Make test_uid required in TestRecord

Author: jonny12375

openhtf/core/test_record.py

@@ -170,6 +170,7 @@ class TestRecord(object):
 
   dut_id = attr.ib(type=Optional[Text])
   station_id = attr.ib(type=Text)
+  test_uid = attr.ib(type=Text)
   dut_extended_id = attr.ib(type=Optional[DutIdentifier], default=None)
   start_time_millis = attr.ib(type=int, default=0)
   end_time_millis = attr.ib(type=Optional[int], default=None)
@@ -186,7 +187,6 @@ 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)

test/core/exe_test.py

@@ -1218,7 +1218,7 @@ def test_execute_repeat_on_measurement_fail_phase(self, phase, meas_value,
         plug_manager=plugs.PlugManager(),
         execution_uid='01234567890',
         state_logger=mock.MagicMock(),
-        test_record=test_record.TestRecord('mock-dut-id', 'mock-station-id'))
+        test_record=test_record.TestRecord(dut_id='mock-dut-id', station_id='mock-station-id', test_uid='mock-test-uid'))
     mock_test_state.plug_manager.initialize_plugs(
         [UnittestPlug, MoreRepeatsUnittestPlug])
     my_phase_record = test_record.PhaseRecord.from_descriptor(phase)

test/output/callbacks/mfg_event_converter_test.py

@@ -59,6 +59,7 @@ def test_mfg_event_from_test_record(self):
         start_time_millis=1,
         end_time_millis=1,
         station_id='localhost',
+        test_uid='testing-123',
         outcome=test_record.Outcome.PASS,
         marginal=False)
     record.outcome = test_record.Outcome.PASS
@@ -150,6 +151,7 @@ def test_populate_basic_data(self):
     record = test_record.TestRecord(
         dut_id='mock-dut-id',
         station_id='mock-station-id',
+        test_uid='mock-test-uid',
         start_time_millis=100,
         end_time_millis=500,
         outcome=test_record.Outcome.PASS,
@@ -198,7 +200,7 @@ def test_populate_basic_data(self):
     self.assertEqual(mfg_event.test_logs[0].lineno, 123)
 
   def test_attach_record_as_json(self):
-    record = test_record.TestRecord('mock-dut-id', 'mock-station-id')
+    record = test_record.TestRecord(dut_id='mock-dut-id', station_id='mock-station-id', test_uid='mock-test-uid',)
     mfg_event = mfg_event_pb2.MfgEvent()
     mfg_event_converter._attach_record_as_json(mfg_event, record)
 
@@ -214,7 +216,7 @@ def test_convert_object_to_json_with_bytes(self):
 
   def test_attach_config(self):
     record = test_record.TestRecord(
-        'mock-dut-id', 'mock-station-id', metadata={'config': {
+        dut_id='mock-dut-id', station_id='mock-station-id', test_uid='mock-test-uid', metadata={'config': {
             'key': 'value'
         }})
     mfg_event = mfg_event_pb2.MfgEvent()

test/util/text_test.py

@@ -100,6 +100,7 @@ def testGetTestOutcomeHeadline_TestNotColorized(self, outcome, headline):
     record = test_record.TestRecord(
         dut_id='TestDutId',
         station_id='test_station',
+        test_uid='testing-123',
         outcome=test_record.Outcome[outcome])
     self.assertEqual(text._GetTestOutcomeHeadline(record), headline)
 
@@ -113,6 +114,7 @@ def testGetTestOutcomeHeadline_TestColorized(self, outcome, headline):
     record = test_record.TestRecord(
         dut_id='TestDutId',
         station_id='test_station',
+        test_uid='testing-123',
         outcome=test_record.Outcome[outcome])
     # TODO(b/70517332): Pytype currently doesn't properly support the functional
     # API of enums: https://github.com/google/pytype/issues/459. Remove