diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-07-17 15:30:43 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-07-17 15:30:43 -0400 |
| commit | f9ef3c200831cfe8240c8b4e44b1a13f14e9d752 (patch) | |
| tree | 3115f8a363f8adca0887f572c6c957492d521420 /tests/unittests/test_builtin_handlers.py | |
| parent | 0c7c5b999e09acf8795c6db2f1b50a801c0eae8f (diff) | |
| parent | 8f70bb7e7144f2225b4e9a589d16ae6d15992a3d (diff) | |
| download | vyos-cloud-init-f9ef3c200831cfe8240c8b4e44b1a13f14e9d752.tar.gz vyos-cloud-init-f9ef3c200831cfe8240c8b4e44b1a13f14e9d752.zip | |
merge from trunk
Diffstat (limited to 'tests/unittests/test_builtin_handlers.py')
| -rw-r--r-- | tests/unittests/test_builtin_handlers.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py index 9cf28215..b387f13b 100644 --- a/tests/unittests/test_builtin_handlers.py +++ b/tests/unittests/test_builtin_handlers.py @@ -1,7 +1,6 @@ """Tests of the built-in user data handlers.""" import os -import unittest from tests.unittests import helpers as test_helpers @@ -35,7 +34,6 @@ 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,6 +45,7 @@ class TestBuiltins(test_helpers.FilesystemMockingTestCase): 'upstart_dir': "/etc/upstart", }) + upstart_job.SUITABLE_UPSTART = True util.ensure_dir("/run") util.ensure_dir("/etc/upstart") |