summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-12 08:56:28 -0400
committerScott Moser <smoser@ubuntu.com>2013-03-12 08:56:28 -0400
commitcad31255aff2b3b7d0d640bf58649aeca43b7263 (patch)
treea6614bfe5d5368391674c538754383a2d33e2eeb /tests
parent73cba9d1f841020b0ee1304f204923d994dd5363 (diff)
downloadvyos-cloud-init-cad31255aff2b3b7d0d640bf58649aeca43b7263.tar.gz
vyos-cloud-init-cad31255aff2b3b7d0d640bf58649aeca43b7263.zip
skip unit test due to LP: #1124384
This re-applies the change in revno 785. A merge made this test pass rather than skip, but I'd rather have it skip for now, as we really hope to have the upstart bug fixed.
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_builtin_handlers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py
index dace486a..9cf28215 100644
--- a/tests/unittests/test_builtin_handlers.py
+++ b/tests/unittests/test_builtin_handlers.py
@@ -1,6 +1,7 @@
"""Tests of the built-in user data handlers."""
import os
+import unittest
from tests.unittests import helpers as test_helpers
@@ -34,6 +35,7 @@ class TestBuiltins(test_helpers.FilesystemMockingTestCase):
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
new_root = self.makeDir()
@@ -47,7 +49,6 @@ class TestBuiltins(test_helpers.FilesystemMockingTestCase):
util.ensure_dir("/run")
util.ensure_dir("/etc/upstart")
- util.write_file("/run/cloud-init-upstart-reload", 'test')
mock_subp = self.mocker.replace(util.subp, passthrough=False)
mock_subp(["initctl", "reload-configuration"], capture=False)