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

infra/services/service_manager/test/service_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 errno
 import json
 import os
 import shutil
 import signal
 import tempfile
@@ skipping 95 matching lines @@
 
     self.s = service.Service(
         self.state_directory,
         {
             'name': 'foo',
             'root_directory': '/rootdir',
             'tool': 'bar',
             'args': ['one', 'two'],
             'stop_time': '86',
         },
+        None,
         time_fn=self.mock_time,
         sleep_fn=self.mock_sleep)
 
     self.mock_pipe = mock.patch('os.pipe').start()
     self.mock_fork = mock.patch('os.fork').start()
     self.mock_close = mock.patch('os.close').start()
     self.mock_exit = mock.patch('os._exit').start()
     self.mock_fdopen = mock.patch('os.fdopen').start()
     self.mock_waitpid = mock.patch('os.waitpid').start()
     self.mock_execv = mock.patch('os.execv').start()
     self.mock_kill = mock.patch('os.kill').start()
     self.mock_become_daemon = mock.patch(
         'infra.libs.service_utils.daemon.become_daemon').start()
+    self.mock_close_all_fds = mock.patch(
+        'infra.libs.service_utils.daemon.close_all_fds').start()
 
   def test_start_already_running(self):
     self._write_state('foo', '{"pid": 1234, "starttime": 5678}')
     self.mock_read_starttime.return_value = 5678
 
     self.s.start()
 
     self.assertFalse(self.mock_fork.called)
 
   def test_start_parent(self):
@@ skipping 79 matching lines @@
 
     # Skip the end of Process.start that assumes it's still the parent process.
     self.mock_exit.side_effect = SystemExit
     with self.assertRaises(SystemExit):
       self.s.start()
 
     self.assertTrue(self.mock_fork.called)
     self.assertTrue(self.mock_pipe.called)
     self.assertEqual(mock.call(42), self.mock_close.call_args_list[0])
     self.mock_fdopen.assert_called_once_with(43, 'w')
-    self.mock_become_daemon.assert_called_once_with(keep_fds={43})
+    self.mock_become_daemon.assert_called_once_with(keep_fds=True)
+    self.mock_close_all_fds.assert_called_once_with(keep_fds=None)
     self.assertEqual('{"pid": 555}', self._all_writes(mock_pipe_object))
     mock_pipe_object.close.assert_called_once_with()
     self.mock_execv.assert_called_once_with('/rootdir/run.py', [
         '/rootdir/run.py',
         'bar',
         'one',
         'two',
     ])
 
   def test_stop_not_running(self):
@@ skipping 102 matching lines @@
 
   def test_has_args_changed_yes(self):
     state = service.ProcessState(
         pid=1234, starttime=5678, version=1, args=['one'])
     self.assertTrue(self.s.has_args_changed(state))
 
   def test_has_args_changed_not_written(self):
     state = service.ProcessState(pid=1234, starttime=5678, version=1)
     self.assertFalse(self.s.has_args_changed(state))
 
+  def test_cloudtail_args(self):
+    self.assertIsNone(self.s.cloudtail_args)
+
+    self.s = service.Service(
+        self.state_directory,
+        {
+            'name': 'foo',
+            'root_directory': '/rootdir',
+            'tool': 'bar',
+            'args': ['one', 'two'],
+            'stop_time': '86',
+        },
+        '/cloudtail',
+        time_fn=self.mock_time,
+        sleep_fn=self.mock_sleep)
+
+    self.assertIn('/cloudtail', self.s.cloudtail_args)
+    self.assertIn('foo', self.s.cloudtail_args)
+
 
 class OwnServiceTest(TestBase):
   def setUp(self):
     super(OwnServiceTest, self).setUp()
 
     self.root_directory = tempfile.mkdtemp()
 
     self.s = service.OwnService(
         self.state_directory,
         self.root_directory)
@@ skipping 32 matching lines @@
 
     state = self.s.get_running_process_state()
     self.assertEqual(1234, state.pid)
     self.assertEqual(5678, state.starttime)
     self.assertEqual(42, state.version)
     self.assertEqual([], state.args)
 
   def test_stop(self):
     with self.assertRaises(NotImplementedError):
       self.s.stop()