status_logger: send step results as well

scripts/master/unittests/status_logger_test.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import json
 import os
 import tempfile
 import shutil
@@ skipping 16 matching lines @@
 
   def getProperty(self, _name):
     return 'whatever'
 
 
 class SourceStamp(object):
   changes = []
 
 
 class Build(object):
+  def __init__(self, steps=None):
+    self.__steps = steps or []
+
   def getNumber(self):
     return 5
 
   def getBuilder(self):
     return Builder()
 
   def getSlavename(self):
     return 'cool-m1'
 
   def getProperty(self, _name):
     return 1427929423.0
 
   def getProperties(self):
     return Properties()
 
   def getSourceStamp(self):
     return SourceStamp()
 
   def getSteps(self):
-    return []
+    return self.__steps
 
   def getTimes(self):
     return 5000, 6000
 
 
 class Step(object):
-  step_number = 8
+  def __init__(self, step_number=8, result=0):
+    self.step_number = step_number
+    self.__result = result
+
   def getName(self):
     return 'reticulating_splines'
 
   def getTimes(self):
     return 5100, 5500
 
+  def getResults(self):
+    return (self.__result, None)
+
 
 @contextlib.contextmanager
 def _make_logger(file_content=None):
   """Create a status_logger and delete any temp files when done."""
   tempdir = tempfile.mkdtemp(prefix='status-logger')
 
   filename = 'logstatus'
   if file_content is None:
     filename = 'does_not_exist'
   else:
@@ skipping 88 matching lines @@
       with open(logger._event_logfile, 'r') as f:
         content = f.read()
         self.assertTrue(content)
         json.loads(content)
 
   def testStopStep(self):
     config_dict = {
         'file_logging': True,
         'event_logging': True,
     }
+    steps = [Step(step_number=1),
+             Step(step_number=2, result=1),
+             Step(step_number=3)]
     with _make_logger(config_dict) as logger:
-      logger.stepFinished(Build(), Step(), [0])
+      logger.stepFinished(Build(steps=steps), steps[-1], [0])
       self.assertTrue(os.path.exists(logger.logfile))
       self.assertTrue(os.path.isdir(logger._event_logging_dir))
       self.assertTrue(os.path.exists(logger._event_logfile))
+
       # Ensure we added valid json
       with open(logger._event_logfile, 'r') as f:
         content = f.read()
         self.assertTrue(content)
         json.loads(content)
 
+      # Ensure we wrote the correct json line.
+      expected = {
+          "slave": "cool-m1",
+          "builder": "coconuts",
+          "timestamp": 5500,
+          "step_result": "success",
+          "subproject_tag": "whatever",
+          "project_id": "whatever",
+      }
+      with open(logger._ts_mon_logfile, 'r') as f:
+        line = f.read()
+        d = json.loads(line)
+        self.assertEqual(expected, d)
+
 
 if __name__ == '__main__':
   unittest.main()