diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2014-07-02 22:00:00 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-02-11 13:02:01 +0100 |
commit | f4f01ec146d91cb6943828851d98eee6a1ad4dd9 (patch) | |
tree | 7a9fa4a45f8b36cd63f4c95bfcf419088e3845d6 /test/sysv-generator-test.py | |
parent | f93b36affa5ac5710cd84bfb8ff0dafabe99fbf1 (diff) |
sysv-generator: Skip init scripts for existing native services
This avoids taking the SysV init script enablement state into account if we
have native units. Otherwise systemctl disable on native unit would not
be respected in the presence of an enabled SysV script.
Also, there's no need to do all the parsing and creation of service files if we
already have a native systemd unit for the processed SysV init script.
Diffstat (limited to 'test/sysv-generator-test.py')
-rw-r--r-- | test/sysv-generator-test.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py index 5098519073..09f5c01762 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -367,6 +367,18 @@ class SysvGeneratorTest(unittest.TestCase): self.assert_enabled('foo.bak.service', []) self.assert_enabled('foo.old.service', []) + def test_existing_native_unit(self): + '''existing native unit''' + + with open(os.path.join(self.unit_dir, 'foo.service'), 'w') as f: + f.write('[Unit]\n') + + self.add_sysv('foo.sh', {'Provides': 'foo bar'}, enable=True) + err, results = self.run_generator() + self.assertEqual(list(results), []) + # no enablement or alias links, as native unit is disabled + self.assertEqual(os.listdir(self.out_dir), []) + if __name__ == '__main__': unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2)) |