[oe-commits] Richard Purdie : oeqa: Update systemd tests to newer systemd behaviour

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: cc813f307c53f83431bae7592e8cfb55fdf6cb7e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cc813f307c53f83431bae7592e8cfb55fdf6cb7e

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sun Feb  9 17:53:54 2014 +0000

oeqa: Update systemd tests to newer systemd behaviour

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oeqa/runtime/systemd.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/runtime/systemd.py b/meta/lib/oeqa/runtime/systemd.py
index 6de84f8..c7a36bc 100644
--- a/meta/lib/oeqa/runtime/systemd.py
+++ b/meta/lib/oeqa/runtime/systemd.py
@@ -72,13 +72,17 @@ class SystemdServiceTests(SystemdTest):
     @skipUnlessPassed('test_systemd_status')
     def test_systemd_stop_start(self):
         self.systemctl('stop', 'avahi-daemon.service')
-        self.systemctl('is-active', 'avahi-daemon.service', expected=3, verbose=True)
+        output = self.systemctl('is-active', 'avahi-daemon.service', verbose=True)
+        self.assertEqual(output, "inactive")
         self.systemctl('start','avahi-daemon.service')
-        self.systemctl('is-active', 'avahi-daemon.service', verbose=True)
+        output = self.systemctl('is-active', 'avahi-daemon.service', verbose=True)
+        self.assertEqual(output, "active")
 
     @skipUnlessPassed('test_systemd_basic')
     def test_systemd_disable_enable(self):
         self.systemctl('disable', 'avahi-daemon.service')
-        self.systemctl('is-enabled', 'avahi-daemon.service', expected=1)
+        output = self.systemctl('is-enabled', 'avahi-daemon.service', expected=1, verbose=True)
+        self.assertEqual(output, "disabled")
         self.systemctl('enable', 'avahi-daemon.service')
-        self.systemctl('is-enabled', 'avahi-daemon.service')
+        output = self.systemctl('is-enabled', 'avahi-daemon.service', verbose=True)
+        self.assertEqual(output, "enabled")