|
 |
1ff636 |
From 20f5864e8f41957f6ed4b94a0199253a821b8c40 Mon Sep 17 00:00:00 2001
|
|
|
1ff636 |
From: Alberto Fanjul Alonso <albertofanjul@gmail.com>
|
|
|
1ff636 |
Date: Tue, 28 Apr 2015 15:44:23 +0200
|
|
|
1ff636 |
Subject: [PATCH] sysv-generator test: Fix assertion
|
|
|
1ff636 |
|
|
|
1ff636 |
(cherry picked from commit 230f04856647fcfb07d5658f4b8c1cb3557fa0d8)
|
|
|
1ff636 |
|
|
|
1ff636 |
Cherry-picked from: 230f048
|
|
|
1ff636 |
Resolves: #1222517
|
|
|
1ff636 |
---
|
|
|
1ff636 |
test/sysv-generator-test.py | 4 ++--
|
|
|
1ff636 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
1ff636 |
|
|
|
1ff636 |
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
|
|
|
c62b8e |
index 09f5c01762..509899e0a5 100644
|
|
|
1ff636 |
--- a/test/sysv-generator-test.py
|
|
|
1ff636 |
+++ b/test/sysv-generator-test.py
|
|
|
1ff636 |
@@ -323,7 +323,7 @@ class SysvGeneratorTest(unittest.TestCase):
|
|
|
1ff636 |
self.add_sysv('foo.sh', {'Provides': 'foo bar'})
|
|
|
1ff636 |
err, results = self.run_generator()
|
|
|
1ff636 |
# ensure we don't try to create a symlink to itself
|
|
|
1ff636 |
- self.assertNotIn(err, 'itself')
|
|
|
1ff636 |
+ self.assertNotIn('itself', err)
|
|
|
1ff636 |
self.assertEqual(list(results), ['foo.service'])
|
|
|
1ff636 |
self.assertEqual(results['foo.service'].get('Unit', 'Description'),
|
|
|
1ff636 |
'LSB: test foo service')
|
|
|
1ff636 |
@@ -361,7 +361,7 @@ class SysvGeneratorTest(unittest.TestCase):
|
|
|
1ff636 |
['foo.bak.service', 'foo.old.service', 'foo.service'])
|
|
|
1ff636 |
|
|
|
1ff636 |
# ensure we don't try to create a symlink to itself
|
|
|
1ff636 |
- self.assertNotIn(err, 'itself')
|
|
|
1ff636 |
+ self.assertNotIn('itself', err)
|
|
|
1ff636 |
|
|
|
1ff636 |
self.assert_enabled('foo.service', [2, 3, 4, 5])
|
|
|
1ff636 |
self.assert_enabled('foo.bak.service', [])
|