From 56401ac57a543395d06690768e63b92633ad15dd Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 21 Jan 2015 09:45:15 +0100 Subject: [PATCH 1/1] systemd-sysv-generator test: don't parse symlinks Generated services which are symlinks should be tested/handled differently from files, so ignore them in run_generator()'s result parsing. --- test/sysv-generator-test.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py index 028de91ea..492e99d83 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -74,6 +74,8 @@ class SysvGeneratorTest(unittest.TestCase): results = {} for service in glob(self.out_dir + '/*.service'): + if os.path.islink(service): + continue cp = RawConfigParser() cp.optionxform = lambda o: o # don't lower-case option names with open(service) as f: @@ -260,8 +262,9 @@ class SysvGeneratorTest(unittest.TestCase): '''multiple Provides: names''' self.add_sysv('foo', {'Provides': 'foo bar baz'}) - s = self.run_generator()[1]['foo.service'] - self.assertEqual(set(s.options('Unit')), + err, results = self.run_generator() + self.assertEqual(list(results), ['foo.service']) + self.assertEqual(set(results['foo.service'].options('Unit')), set(['Documentation', 'SourcePath', 'Description'])) # should create symlinks for the alternative names for f in ['bar.service', 'baz.service']: -- 2.30.2