diff mbox series

[2/2] oeqa/selftest/bbclasses: Add tests for systemd and update-rc.d interaction

Message ID 20240820203533.4166641-2-pkj@axis.com
State Accepted, archived
Commit 4ef25caa00ad08046567d0e7f4523486c3a256d0
Headers show
Series [1/2] systemd.bbclass: Clean up empty parent directories | expand

Commit Message

Peter Kjellerstedt Aug. 20, 2024, 8:35 p.m. UTC 
These tests verify that the correct files are left behind when systemd
is inherited and depending on whether the systemd and/or sysvinit distro
features are enabled.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 .../bbclasses/systemd-and-sysvinit.bb         |  15 +++
 .../recipes-test/bbclasses/systemd-only.bb    |  10 ++
 meta/lib/oeqa/selftest/cases/bbclasses.py     | 106 ++++++++++++++++++
 3 files changed, 131 insertions(+)
 create mode 100644 meta-selftest/recipes-test/bbclasses/systemd-and-sysvinit.bb
 create mode 100644 meta-selftest/recipes-test/bbclasses/systemd-only.bb
 create mode 100644 meta/lib/oeqa/selftest/cases/bbclasses.py

Comments

Khem Raj Aug. 20, 2024, 9:24 p.m. UTC | #1 
On Tue, Aug 20, 2024 at 1:35 PM Peter Kjellerstedt via
lists.openembedded.org <peter.kjellerstedt=axis.com@lists.openembedded.org>
wrote:

> These tests verify that the correct files are left behind when systemd
> is inherited and depending on whether the systemd and/or sysvinit distro
> features are enabled.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
>  .../bbclasses/systemd-and-sysvinit.bb         |  15 +++
>  .../recipes-test/bbclasses/systemd-only.bb    |  10 ++
>  meta/lib/oeqa/selftest/cases/bbclasses.py     | 106 ++++++++++++++++++
>  3 files changed, 131 insertions(+)
>  create mode 100644 meta-selftest/recipes-test/bbclasses/
> systemd-and-sysvinit.bb
>  create mode 100644 meta-selftest/recipes-test/bbclasses/systemd-only.bb
>  create mode 100644 meta/lib/oeqa/selftest/cases/bbclasses.py
>
> diff --git a/meta-selftest/recipes-test/bbclasses/systemd-and-sysvinit.bb
> b/meta-selftest/recipes-test/bbclasses/systemd-and-sysvinit.bb
> new file mode 100644
> index 0000000000..b820a10528
> --- /dev/null
> +++ b/meta-selftest/recipes-test/bbclasses/systemd-and-sysvinit.bb
> @@ -0,0 +1,15 @@
> +LICENSE = "CLOSED"
> +
> +inherit allarch systemd update-rc.d
> +
> +do_install() {
> +       install -d ${D}${systemd_system_unitdir}
> +       touch ${D}${systemd_system_unitdir}/${BPN}.service
> +
> +       install -d ${D}${INIT_D_DIR}
> +       touch ${D}${INIT_D_DIR}/${BPN}
> +}
> +
> +INITSCRIPT_NAME = "${BPN}"
> +
> +SYSTEMD_SERVICE:${PN} = "${BPN}.service"
> diff --git a/meta-selftest/recipes-test/bbclasses/systemd-only.bb
> b/meta-selftest/recipes-test/bbclasses/systemd-only.bb
> new file mode 100644
> index 0000000000..3a28713cb5
> --- /dev/null
> +++ b/meta-selftest/recipes-test/bbclasses/systemd-only.bb
> @@ -0,0 +1,10 @@
> +LICENSE = "CLOSED"
> +


License is not conducive to project here so it has to change to something
open


> +inherit allarch systemd
> +
> +do_install() {
> +       install -d ${D}${systemd_system_unitdir}
> +       touch ${D}${systemd_system_unitdir}/${BPN}.service
> +}
> +
> +SYSTEMD_SERVICE:${PN} = "${BPN}.service"
> diff --git a/meta/lib/oeqa/selftest/cases/bbclasses.py
> b/meta/lib/oeqa/selftest/cases/bbclasses.py
> new file mode 100644
> index 0000000000..10545ebe65
> --- /dev/null
> +++ b/meta/lib/oeqa/selftest/cases/bbclasses.py
> @@ -0,0 +1,106 @@
> +#
> +# Copyright OpenEmbedded Contributors
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +from oeqa.selftest.case import OESelftestTestCase
> +from oeqa.utils.commands import get_bb_vars, bitbake
> +
> +class Systemd(OESelftestTestCase):
> +    """
> +    Tests related to the systemd bbclass.
> +    """
> +
> +    def getVars(self, recipe):
> +        self.bb_vars = get_bb_vars(
> +            [
> +                'BPN',
> +                'D',
> +                'INIT_D_DIR',
> +                'prefix',
> +                'systemd_system_unitdir',
> +                'sysconfdir',
> +            ],
> +            recipe,
> +        )
> +
> +    def fileExists(self, filename):
> +        self.assertExists(filename.format(**self.bb_vars))
> +
> +    def fileNotExists(self, filename):
> +        self.assertNotExists(filename.format(**self.bb_vars))
> +
> +    def test_systemd_in_distro(self):
> +        """
> +        Summary:    Verify that no sysvinit files are installed when the
> +                    systemd distro feature is enabled, but sysvinit is
> not.
> +        Expected:   Systemd service file exists, but /etc does not.
> +        Product:    OE-Core
> +        Author:     Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> +        """
> +
> +        self.write_config("""
> +DISTRO_FEATURES:append = " systemd usrmerge"
> +DISTRO_FEATURES:remove = "sysvinit"
> +VIRTUAL-RUNTIME_init_manager = "systemd"
> +""")
> +        bitbake("systemd-only systemd-and-sysvinit -c install")
> +
> +        self.getVars("systemd-only")
> +        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
> +
> +        self.getVars("systemd-and-sysvinit")
> +        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
> +        self.fileNotExists("{D}{sysconfdir}")
> +
> +    def test_systemd_and_sysvinit_in_distro(self):
> +        """
> +        Summary:    Verify that both systemd and sysvinit files are
> installed
> +                    when both the systemd and sysvinit distro features are
> +                    enabled.
> +        Expected:   Systemd service file and sysvinit initscript exist.
> +        Product:    OE-Core
> +        Author:     Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> +        """
> +
> +        self.write_config("""
> +DISTRO_FEATURES:append = " systemd sysvinit usrmerge"
> +VIRTUAL-RUNTIME_init_manager = "systemd"
> +""")
> +        bitbake("systemd-only systemd-and-sysvinit -c install")
> +
> +        self.getVars("systemd-only")
> +        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
> +
> +        self.getVars("systemd-and-sysvinit")
> +        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
> +        self.fileExists("{D}{INIT_D_DIR}/{BPN}")
> +
> +    def test_sysvinit_in_distro(self):
> +        """
> +        Summary:    Verify that no systemd service files are installed
> when the
> +                    sysvinit distro feature is enabled, but systemd is
> not.
> +        Expected:   The systemd  service file does not exist, nor does
> /usr.
> +                    The sysvinit initscript exists.
> +        Product:    OE-Core
> +        Author:     Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> +        """
> +
> +        self.write_config("""
> +DISTRO_FEATURES:remove = "systemd"
> +DISTRO_FEATURES:append = " sysvinit usrmerge"
> +VIRTUAL-RUNTIME_init_manager = "sysvinit"
> +""")
> +        bitbake("systemd-only systemd-and-sysvinit -c install")
> +
> +        self.getVars("systemd-only")
> +        self.fileNotExists("{D}{systemd_system_unitdir}/{BPN}.service")
> +        self.fileNotExists("{D}{prefix}")
> +        self.fileNotExists("{D}{sysconfdir}")
> +        self.fileExists("{D}")
> +
> +        self.getVars("systemd-and-sysvinit")
> +        self.fileNotExists("{D}{systemd_system_unitdir}/{BPN}.service")
> +        self.fileNotExists("{D}{prefix}")
> +        self.fileExists("{D}{INIT_D_DIR}/{BPN}")
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#203568):
> https://lists.openembedded.org/g/openembedded-core/message/203568
> Mute This Topic: https://lists.openembedded.org/mt/108008174/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
diff mbox series

Patch

diff --git a/meta-selftest/recipes-test/bbclasses/systemd-and-sysvinit.bb b/meta-selftest/recipes-test/bbclasses/systemd-and-sysvinit.bb
new file mode 100644
index 0000000000..b820a10528
--- /dev/null
+++ b/meta-selftest/recipes-test/bbclasses/systemd-and-sysvinit.bb
@@ -0,0 +1,15 @@ 
+LICENSE = "CLOSED"
+
+inherit allarch systemd update-rc.d
+
+do_install() {
+	install -d ${D}${systemd_system_unitdir}
+	touch ${D}${systemd_system_unitdir}/${BPN}.service
+
+	install -d ${D}${INIT_D_DIR}
+	touch ${D}${INIT_D_DIR}/${BPN}
+}
+
+INITSCRIPT_NAME = "${BPN}"
+
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
diff --git a/meta-selftest/recipes-test/bbclasses/systemd-only.bb b/meta-selftest/recipes-test/bbclasses/systemd-only.bb
new file mode 100644
index 0000000000..3a28713cb5
--- /dev/null
+++ b/meta-selftest/recipes-test/bbclasses/systemd-only.bb
@@ -0,0 +1,10 @@ 
+LICENSE = "CLOSED"
+
+inherit allarch systemd
+
+do_install() {
+	install -d ${D}${systemd_system_unitdir}
+	touch ${D}${systemd_system_unitdir}/${BPN}.service
+}
+
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
diff --git a/meta/lib/oeqa/selftest/cases/bbclasses.py b/meta/lib/oeqa/selftest/cases/bbclasses.py
new file mode 100644
index 0000000000..10545ebe65
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/bbclasses.py
@@ -0,0 +1,106 @@ 
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import get_bb_vars, bitbake
+
+class Systemd(OESelftestTestCase):
+    """
+    Tests related to the systemd bbclass.
+    """
+
+    def getVars(self, recipe):
+        self.bb_vars = get_bb_vars(
+            [
+                'BPN',
+                'D',
+                'INIT_D_DIR',
+                'prefix',
+                'systemd_system_unitdir',
+                'sysconfdir',
+            ],
+            recipe,
+        )
+
+    def fileExists(self, filename):
+        self.assertExists(filename.format(**self.bb_vars))
+
+    def fileNotExists(self, filename):
+        self.assertNotExists(filename.format(**self.bb_vars))
+
+    def test_systemd_in_distro(self):
+        """
+        Summary:    Verify that no sysvinit files are installed when the
+                    systemd distro feature is enabled, but sysvinit is not.
+        Expected:   Systemd service file exists, but /etc does not.
+        Product:    OE-Core
+        Author:     Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+        """
+
+        self.write_config("""
+DISTRO_FEATURES:append = " systemd usrmerge"
+DISTRO_FEATURES:remove = "sysvinit"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+""")
+        bitbake("systemd-only systemd-and-sysvinit -c install")
+
+        self.getVars("systemd-only")
+        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
+
+        self.getVars("systemd-and-sysvinit")
+        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
+        self.fileNotExists("{D}{sysconfdir}")
+
+    def test_systemd_and_sysvinit_in_distro(self):
+        """
+        Summary:    Verify that both systemd and sysvinit files are installed
+                    when both the systemd and sysvinit distro features are
+                    enabled.
+        Expected:   Systemd service file and sysvinit initscript exist.
+        Product:    OE-Core
+        Author:     Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+        """
+
+        self.write_config("""
+DISTRO_FEATURES:append = " systemd sysvinit usrmerge"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+""")
+        bitbake("systemd-only systemd-and-sysvinit -c install")
+
+        self.getVars("systemd-only")
+        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
+
+        self.getVars("systemd-and-sysvinit")
+        self.fileExists("{D}{systemd_system_unitdir}/{BPN}.service")
+        self.fileExists("{D}{INIT_D_DIR}/{BPN}")
+
+    def test_sysvinit_in_distro(self):
+        """
+        Summary:    Verify that no systemd service files are installed when the
+                    sysvinit distro feature is enabled, but systemd is not.
+        Expected:   The systemd  service file does not exist, nor does /usr.
+                    The sysvinit initscript exists.
+        Product:    OE-Core
+        Author:     Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+        """
+
+        self.write_config("""
+DISTRO_FEATURES:remove = "systemd"
+DISTRO_FEATURES:append = " sysvinit usrmerge"
+VIRTUAL-RUNTIME_init_manager = "sysvinit"
+""")
+        bitbake("systemd-only systemd-and-sysvinit -c install")
+
+        self.getVars("systemd-only")
+        self.fileNotExists("{D}{systemd_system_unitdir}/{BPN}.service")
+        self.fileNotExists("{D}{prefix}")
+        self.fileNotExists("{D}{sysconfdir}")
+        self.fileExists("{D}")
+
+        self.getVars("systemd-and-sysvinit")
+        self.fileNotExists("{D}{systemd_system_unitdir}/{BPN}.service")
+        self.fileNotExists("{D}{prefix}")
+        self.fileExists("{D}{INIT_D_DIR}/{BPN}")