diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-07-09 02:33:57 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-07-09 02:33:57 -0400 |
| commit | a3e7ecd45fcc25736863aa81b73a5d7f14619be1 (patch) | |
| tree | 710382be5bda570764b79dcd9514cf08734fe247 /tests/unittests | |
| parent | 21ea6154ab2aafbe51c7b23fd56e43bd1cc26b00 (diff) | |
| parent | 1c76b49ccbe0c31187aeea12b0e395774aa90faa (diff) | |
| download | vyos-cloud-init-a3e7ecd45fcc25736863aa81b73a5d7f14619be1.tar.gz vyos-cloud-init-a3e7ecd45fcc25736863aa81b73a5d7f14619be1.zip | |
merge from trunk
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_builtin_handlers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py index 9cf28215..e25a5144 100644 --- a/tests/unittests/test_builtin_handlers.py +++ b/tests/unittests/test_builtin_handlers.py @@ -35,7 +35,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 +46,7 @@ class TestBuiltins(test_helpers.FilesystemMockingTestCase): 'upstart_dir': "/etc/upstart", }) + upstart_job.SUITABLE_UPSTART = True util.ensure_dir("/run") util.ensure_dir("/etc/upstart") |