systemd-sysv-generator test: fix enabled check

[elogind.git] / test / sysv-generator-test.py

diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index 028de91eab48fb63ea4db420c96d988c7b1bc3d1..2a84f9fcaf432e17f3cb361d983624cbf13c4d4a 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'):
+            if os.path.islink(service):
+                continue
             cp = RawConfigParser()
             cp.optionxform = lambda o: o  # don't lower-case option names
             with open(service) as f:
@@ -131,11 +133,11 @@ class SysvGeneratorTest(unittest.TestCase):
 
         # should be enabled
         for runlevel in all_runlevels:
-            link = os.path.join(self.out_dir, 'runlevel%i.target.wants' % runlevel, 'foo.service')
+            link = os.path.join(self.out_dir, 'runlevel%i.target.wants' % runlevel, unit)
             if runlevel in runlevels:
                 target = os.readlink(link)
                 self.assertTrue(os.path.exists(target))
-                self.assertEqual(os.path.basename(target), 'foo.service')
+                self.assertEqual(os.path.basename(target), unit)
             else:
                 self.assertFalse(os.path.exists(link),
                                  '%s unexpectedly exists' % link)
@@ -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']: