add cached parameters (#955)

Author: wallacbe

openhtf/output/callbacks/mfg_inspector.py

@@ -125,6 +125,7 @@ class MfgInspector(object):
   SCOPE_CODE_URI = 'https://www.googleapis.com/auth/glass.infra.quantum_upload'
   DESTINATION_URL = ('https://clients2.google.com/factoryfactory/'
                      'uploads/quantum_upload/?json')
+  PARAMS =  ['dut_id', 'end_time_millis', 'start_time_millis', 'station_id']
 
   # These attributes control format of callback and what actions are undertaken
   # when called.  These should either be set by a subclass or via configure.
@@ -158,6 +159,7 @@ def __init__(self, user=None, keydata=None,
     self.upload_result = None
 
     self._cached_proto = None
+    self._cached_params = dict.fromkeys(self.PARAMS)
 
   @classmethod
   def from_json(cls, json_data):
@@ -177,12 +179,19 @@ def from_json(cls, json_data):
                keydata=json_data['private_key'],
                token_uri=json_data['token_uri'])
 
+  def _check_cached_params(self, test_record_obj):
+    """Check if all cached params equal the values in test record."""
+    for param in self.PARAMS:
+      if self._cached_params[param] != getattr(test_record_obj, param):
+        return False
+    return True
+
   def _convert(self, test_record_obj):
     """Convert and cache a test record to a mfg-inspector proto."""
-
-    if self._cached_proto is None:
+    if self._cached_proto is None or not self._check_cached_params(test_record_obj):
       self._cached_proto = self._converter(test_record_obj)
-
+      for param in self.PARAMS:
+        self._cached_params[param] = getattr(test_record_obj, param)
     return self._cached_proto
 
   def save_to_disk(self, filename_pattern=None):

test/output/callbacks/mfg_inspector_test.py

@@ -18,6 +18,7 @@
 actually care for.
 """
 
+import collections
 import io
 import unittest
 
@@ -40,6 +41,9 @@
     test_info=test_runs_pb2.TestInfo(name='unit_test')
 )
 
+MOCK_TEST_RUN = collections.namedtuple(
+    'Testrun', mfg_inspector.MfgInspector.PARAMS)(None, None, None, None)
+
 
 class TestMfgInspector(test.TestCase):
 
@@ -100,7 +104,7 @@ def test_upload_only(self):
         user='user', keydata='keydata', token_uri='').set_converter(
             mock_converter)
 
-    callback.upload()({})
+    callback.upload()(MOCK_TEST_RUN)
 
     self.mock_send_mfg_inspector_data.assert_called_with(
         MOCK_TEST_RUN_PROTO, self.mock_credentials, callback.destination_url)
@@ -113,8 +117,8 @@ def test_save_and_upload(self):
         user='user', keydata='keydata', token_uri='')
     callback.set_converter(mock_converter)
 
-    callback.save_to_disk(filename_pattern=testrun_output)({})
-    callback.upload()({})
+    callback.save_to_disk(filename_pattern=testrun_output)(MOCK_TEST_RUN)
+    callback.upload()(MOCK_TEST_RUN)
 
     # Parse what was written to BytesIO back into a proto and compare
     testrun_output.seek(0)