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.

diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index 028de91eab48fb63ea4db420c96d988c7b1bc3d1..492e99d834cbdbbd8b499372a4120e8c30dc6692 100644 (file)
--- 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'):
 
         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:
             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'})
         '''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']:
                          set(['Documentation', 'SourcePath', 'Description']))
         # should create symlinks for the alternative names
         for f in ['bar.service', 'baz.service']: