diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-01-20 16:41:31 +0100 |
---|---|---|
committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-01-21 14:53:38 +0100 |
commit | 29e0e6d8c1f7f648b7c998880d034eaa3e58c53a (patch) | |
tree | a8433f8ba4bba2f9fc882b4368d67f638401368c /test | |
parent | 9cba813191c9e7897f7856cbe10f19600f1d56e5 (diff) | |
download | systemd-29e0e6d8c1f7f648b7c998880d034eaa3e58c53a.tar.gz systemd-29e0e6d8c1f7f648b7c998880d034eaa3e58c53a.tar.bz2 systemd-29e0e6d8c1f7f648b7c998880d034eaa3e58c53a.zip |
sysv-generator: Handle .sh suffixes when translating Provides:
When deciding whether the provided name equals the file name in
sysv_translate_facility(), also consider them equal if the file name has a
".sh" suffix.
This was uncovered by commit b7e7184 which then created a symlink
"<name>.service" to itself for ".sh" suffixed init.d scripts.
For additional robustness, refuse to create symlinks to itself in add_alias().
Add test case which reproduces the bug.
https://bugs.debian.org/775889
Diffstat (limited to 'test')
-rw-r--r-- | test/sysv-generator-test.py | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py index 2a84f9fcaf..a3daa9fc6b 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -278,6 +278,42 @@ class SysvGeneratorTest(unittest.TestCase): err, results = self.run_generator() self.assertEqual(results, {}) + def test_sh_suffix(self): + '''init.d script with .sh suffix''' + + self.add_sysv('foo.sh', {}, enable=True) + err, results = self.run_generator() + s = results['foo.service'] + + self.assertEqual(s.sections(), ['Unit', 'Service']) + # should not have a .sh + self.assertEqual(s.get('Unit', 'Description'), 'LSB: test foo service') + + # calls correct script with .sh + init_script = os.path.join(self.init_d_dir, 'foo.sh') + self.assertEqual(s.get('Service', 'ExecStart'), + '%s start' % init_script) + self.assertEqual(s.get('Service', 'ExecStop'), + '%s stop' % init_script) + + self.assert_enabled('foo.service', [2, 3, 4, 5]) + + def test_sh_suffix_with_provides(self): + '''init.d script with .sh suffix and Provides:''' + + self.add_sysv('foo.sh', {'Provides': 'foo bar'}) + err, results = self.run_generator() + # ensure we don't try to create a symlink to itself + self.assertNotIn(err, 'itself') + self.assertEqual(list(results), ['foo.service']) + self.assertEqual(results['foo.service'].get('Unit', 'Description'), + 'LSB: test foo service') + + # should create symlink for the alternative name + self.assertEqual(os.readlink(os.path.join(self.out_dir, 'bar.service')), + 'foo.service') + + if __name__ == '__main__': unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2)) |