Have service_manager start a cloudtail attached to each service it starts.

infra/services/service_manager/test/service_thread_test.py

 # 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 threading
 import unittest
 
 import mock
 
 from infra.services.service_manager import service
@@ skipping 39 matching lines @@
     service_thread.ServiceThread.upgrades.reset()
 
     self.mock_service_ctor = mock.patch(
         'infra.services.service_manager.service.Service').start()
     self.mock_service = self.mock_service_ctor.return_value
     self.mock_service.name = 'foo'
 
     config = {'name': 'foo'}
     self.condition = FakeCondition()
     self.t = service_thread.ServiceThread(
-        10, '/foo', config, wait_condition=self.condition)
+        10, '/foo', config, None, wait_condition=self.condition)
 
-    self.mock_service_ctor.assert_called_once_with('/foo', config)
+    self.mock_service_ctor.assert_called_once_with('/foo', config, None)
 
   def tearDown(self):
     if self.t.is_alive():
       self.t.stop(join=False)
       self.condition.next(blocking=False)
       self.t.join()
 
     mock.patch.stopall()
 
   def test_run_and_exit(self):
@@ skipping 118 matching lines @@
     new_config = {'name': 'bar'}
     new_service = mock.Mock()
     self.mock_service_ctor.return_value = new_service
 
     self.t.restart_with_new_config(new_config)
     self.assertTrue(self.condition.notify_called)
     self.condition.next()
 
     self.assertEqual(1, self.t.reconfigs.get({'service': 'foo'}))
     self.mock_service.stop.assert_called_once_with()
-    self.mock_service_ctor.assert_called_with('/foo', new_config)
+    self.mock_service_ctor.assert_called_with('/foo', new_config, None)
     new_service.start.assert_called_once_with()
 
   def test_new_args_on_startup(self):
     self.t.start()
     self.condition.start()
 
     self.assertEqual(0, self.t.reconfigs.get({'service': 'foo'}))
 
     self.mock_service.get_running_process_state.return_value = (
         service.ProcessState(pid=1, starttime=2))
@@ skipping 13 matching lines @@
     self.mock_service.start.side_effect = Exception()
 
     self.t.start_service()
     self.assertTrue(self.condition.notify_called)
     self.condition.next()
 
     self.mock_service.start.assert_called_once_with()
 
     # The loop should continue.
     self.condition.next()