From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Wed, 1 Jul 2015 10:05:57 +0000 (+0200)
Subject: systemd-fsckd autopkgtest: Stop using/asserting on lightdm
X-Git-Tag: debian/247.3-7+deb11u1~1554
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a0b80435977931f3079b7e0705bd89cdddbe78a1;p=systemd.git

systemd-fsckd autopkgtest: Stop using/asserting on lightdm

Just check that default.target is active. lightdm is prone to fail in test
environments, and fiddling with it in two other autopkgtests is sufficient.
---

diff --git a/debian/changelog b/debian/changelog
index bfc927cca..85342cda3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ systemd (221-2) UNRELEASED; urgency=medium
     the link check, to also avoid libeatmydata. (Closes: #790546)
   * boot-and-services, display-managers autopkgtests: Install and configure
     dummy X.org driver, so that these work in headless machines/VMs.
+  * systemd-fsckd autopkgtest: Stop using/asserting on lightdm, just check
+    that default.target is active. lightdm is prone to fail in test
+    environments, and fiddling with it in two other autopkgtests is
+    sufficient.
 
  -- Martin Pitt <mpitt@debian.org>  Mon, 29 Jun 2015 07:42:50 +0200
 
diff --git a/debian/tests/control b/debian/tests/control
index 8d9e20c8e..528e76476 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -42,5 +42,5 @@ Depends: systemd-sysv, network-manager, policykit-1, lightdm
 Restrictions: needs-recommends, needs-root, isolation-container, allow-stderr
 
 Tests: systemd-fsckd
-Depends: systemd, systemd-sysv, python3, lightdm, plymouth
+Depends: systemd-sysv, python3, plymouth
 Restrictions: needs-root, isolation-machine, needs-recommends, breaks-testbed
diff --git a/debian/tests/systemd-fsckd b/debian/tests/systemd-fsckd
index 7b40de436..ba26085e4 100755
--- a/debian/tests/systemd-fsckd
+++ b/debian/tests/systemd-fsckd
@@ -186,12 +186,9 @@ class FsckdTest(unittest.TestCase):
             self.assertFalse(self.was_running('plymouth-start'))
 
     def assertSystemRunning(self):
-        '''Assert we started lightdm and xorg (and so, consider the system running)'''
-        out = subprocess.check_output(['ps', 'u', '-C', 'lightdm'])
-        self.assertIn(b'lightdm --session', out)
-        out = subprocess.check_output(['ps', 'u', '-C', 'Xorg'])
-        self.assertIn(b':0', out)
-        self.assertTrue(self.is_active_unit('lightdm'))
+        '''Assert that the system is running'''
+
+        self.assertTrue(self.is_active_unit('default.target'))
 
     def assertProcessKilled(self):
         '''Assert the targeted process was killed successfully'''