tell upstart to reload configuration after writing an upstart job

Invoking 'initctl reload-configuration' is only required if inotify 
does not work.  overlayroot does not support inotify.  So, we just
call initctl always, which wont hurt anything.

LP: #1080841

1 files changed, 7 insertions, 2 deletions

diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py
index ebc0bd51..5f41cb3d 100644
--- a/tests/unittests/test_builtin_handlers.py
+++ b/tests/unittests/test_builtin_handlers.py
@@ -6,6 +6,7 @@ from mocker import MockerTestCase
 
 from cloudinit import handlers
 from cloudinit import helpers
+from cloudinit import util
 
 from cloudinit.handlers import upstart_job
 
@@ -34,6 +35,7 @@ class TestBuiltins(MockerTestCase):
         self.assertEquals(0, len(os.listdir(up_root)))
 
     def test_upstart_frequency_single(self):
+        # files should be written out when frequency is ! per-instance
         c_root = self.makeDir()
         up_root = self.makeDir()
         paths = helpers.Paths({
@@ -41,9 +43,12 @@ class TestBuiltins(MockerTestCase):
             'upstart_dir': up_root,
         })
         freq = PER_INSTANCE
+
+        mock_subp = self.mocker.replace(util.subp, passthrough=False)
+        mock_subp(["initctl", "reload-configuration"], capture=False)
+        self.mocker.replay()
+
         h = upstart_job.UpstartJobPartHandler(paths)
-        # No files should be written out when
-        # the frequency is ! per-instance
         h.handle_part('', handlers.CONTENT_START,
                       None, None, None)
         h.handle_part('blah', 'text/upstart-job',