merge from trunk

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py
index ebc0bd51..da52f15b 100644
--- a/tests/unittests/test_builtin_handlers.py
+++ b/tests/unittests/test_builtin_handlers.py
@@ -1,11 +1,13 @@
 """Tests of the built-in user data handlers."""
 
 import os
+import unittest
 
 from mocker import MockerTestCase
 
 from cloudinit import handlers
 from cloudinit import helpers
+from cloudinit import util
 
 from cloudinit.handlers import upstart_job
 
@@ -33,7 +35,9 @@ class TestBuiltins(MockerTestCase):
                       None, None, None)
         self.assertEquals(0, len(os.listdir(up_root)))
 
+    @unittest.skip("until LP: #1124384 fixed")
     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 +45,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',