summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-03-08 15:57:05 -0800
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-03-08 15:57:05 -0800
commit73cba9d1f841020b0ee1304f204923d994dd5363 (patch)
treebd3169edfc958b0ecd0eaf91ea244e51963c2ac4 /tests
parent973747b00af47c94ba0a719452aa823fb688e5ab (diff)
downloadvyos-cloud-init-73cba9d1f841020b0ee1304f204923d994dd5363.tar.gz
vyos-cloud-init-73cba9d1f841020b0ee1304f204923d994dd5363.zip
Enable the merging.txt to be in .rst format for public viewing
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/helpers.py1
-rw-r--r--tests/unittests/test_builtin_handlers.py24
2 files changed, 15 insertions, 10 deletions
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 904677f1..e020a3ec 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -175,6 +175,7 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
def patchOS(self, new_root):
patch_funcs = {
os.path: ['isfile', 'exists', 'islink', 'isdir'],
+ os: ['listdir'],
}
for (mod, funcs) in patch_funcs.items():
for f in funcs:
diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py
index da52f15b..dace486a 100644
--- a/tests/unittests/test_builtin_handlers.py
+++ b/tests/unittests/test_builtin_handlers.py
@@ -1,9 +1,8 @@
"""Tests of the built-in user data handlers."""
import os
-import unittest
-from mocker import MockerTestCase
+from tests.unittests import helpers as test_helpers
from cloudinit import handlers
from cloudinit import helpers
@@ -14,7 +13,7 @@ from cloudinit.handlers import upstart_job
from cloudinit.settings import (PER_ALWAYS, PER_INSTANCE)
-class TestBuiltins(MockerTestCase):
+class TestBuiltins(test_helpers.FilesystemMockingTestCase):
def test_upstart_frequency_no_out(self):
c_root = self.makeDir()
@@ -35,16 +34,20 @@ 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()
+ new_root = self.makeDir()
+ freq = PER_INSTANCE
+
+ self.patchOS(new_root)
+ self.patchUtils(new_root)
paths = helpers.Paths({
- 'cloud_dir': c_root,
- 'upstart_dir': up_root,
+ 'upstart_dir': "/etc/upstart",
})
- freq = PER_INSTANCE
+
+ 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)
@@ -57,4 +60,5 @@ class TestBuiltins(MockerTestCase):
'test.conf', 'blah', freq)
h.handle_part('', handlers.CONTENT_END,
None, None, None)
- self.assertEquals(1, len(os.listdir(up_root)))
+
+ self.assertEquals(1, len(os.listdir('/etc/upstart')))