systemd-fsckd autopkgtest: Fix test_systemd_fsck_with_plymouth_failure

Fix plymouthd status check to work under both Debian and Ubuntu.

diff --git a/debian/changelog b/debian/changelog
index 5f1744558e600936615730622975f755ce21dca4..71d341a507cbbb9e51a59558bc7850d9f305c33f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,10 @@ systemd (220-1) UNRELEASED; urgency=medium
     GUdev from a separate source.
   * bootchart autopkgtest: Skip test if /proc/schedstat does not exist, i. e.
     the kernel is missing CONFIG_SCHEDSTAT. Bootchart requires this.
-  * systemd-fsckd: On Debian plymouth-start stays running, adjust
+  * systemd-fsckd autopkgtest: On Debian plymouth-start stays running, adjust
     was_running() for that.
+  * systemd-fsckd autopkgtest: In test_systemd_fsck_with_plymouth_failure(),
+    fix plymouthd status check to work under both Debian and Ubuntu.
 
  -- Martin Pitt <mpitt@debian.org>  Fri, 22 May 2015 14:41:48 +0200
 

diff --git a/debian/tests/systemd-fsckd b/debian/tests/systemd-fsckd
index 6b939612c83237432190944b1c42c89d52b465d7..7b40de4362c1b68007416554805695dba0c998c6 100755 (executable)
--- a/debian/tests/systemd-fsckd
+++ b/debian/tests/systemd-fsckd
@@ -134,7 +134,7 @@ class FsckdTest(unittest.TestCase):
             self.assertFsckdStop()
             self.assertProcessKilled()
             self.assertFsckProceeded()
-            self.assertTrue(self.is_failed_unit('plymouth-start'))
+            self.assertFalse(self.is_active_unit('plymouth-start'))
             self.assertSystemRunning()
 
     def install_bin(self, source, dest):