| Message ID | 20200301151747.25723-5-unixmania@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | openrc: bump to version 0.42.1 | expand |
Carlos, Adam, All, On 2020-03-01 12:17 -0300, unixmania@gmail.com spake thusly: > From: Adam Duskett <Aduskett@gmail.com> > > Two simple tests to ensure that openrc boots without any services crashing > with a read only and a read write filing system. > > Signed-off-by: Adam Duskett <Aduskett@gmail.com> > Signed-off-by: Carlos Santos <unixmania@gmail.com> Thanks for this new runtime test! :-) Would it make sense to apply just this test to master? Or does it really need the version bump first? Regards, Yann E. MORIN. > --- > .gitlab-ci.yml | 2 + > support/testing/tests/init/test_openrc.py | 51 +++++++++++++++++++++++ > 2 files changed, 53 insertions(+) > create mode 100644 support/testing/tests/init/test_openrc.py > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index b4dad3173e..382a7c59b2 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -368,6 +368,8 @@ tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test } > tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test } > tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test } > tests.init.test_none.TestInitSystemNone: { extends: .runtime_test } > +tests.init.test_openrc.TestInitSystemOpenrcRoFull: { extends: .runtime_test } > +tests.init.test_openrc.TestInitSystemOpenrcRwFull: { extends: .runtime_test } > tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test } > tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test } > tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test } > diff --git a/support/testing/tests/init/test_openrc.py b/support/testing/tests/init/test_openrc.py > new file mode 100644 > index 0000000000..23669a9572 > --- /dev/null > +++ b/support/testing/tests/init/test_openrc.py > @@ -0,0 +1,51 @@ > +import infra.basetest > +from tests.init.base import InitSystemBase as InitSystemBase > + > + > +class InitSystemOpenrcBase(InitSystemBase): > + config = \ > + """ > + BR2_arm=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_INIT_OPENRC=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7" > + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > + BR2_LINUX_KERNEL_DTS_SUPPORT=y > + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > + # BR2_TARGET_ROOTFS_TAR is not set > + """ > + > + def check_init(self): > + super(InitSystemOpenrcBase, self) > + > + # Test all services are OK > + output, _ = self.emulator.run("rc-status -c") > + self.assertEqual(len(output), 0) > + > + > +class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase): > + config = InitSystemOpenrcBase.config + \ > + """ > + BR2_SYSTEM_DHCP="eth0" > + # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set > + BR2_TARGET_ROOTFS_SQUASHFS=y > + """ > + > + def test_run(self): > + self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") > + self.check_init() > + > + > +class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase): > + config = InitSystemOpenrcBase.config + \ > + """ > + BR2_SYSTEM_DHCP="eth0" > + BR2_TARGET_ROOTFS_EXT2=y > + """ > + > + def test_run(self): > + self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") > + self.check_init() > -- > 2.18.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
On Sun, Mar 1, 2020 at 2:40 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > Carlos, Adam, All, > > On 2020-03-01 12:17 -0300, unixmania@gmail.com spake thusly: > > From: Adam Duskett <Aduskett@gmail.com> > > > > Two simple tests to ensure that openrc boots without any services crashing > > with a read only and a read write filing system. > > > > Signed-off-by: Adam Duskett <Aduskett@gmail.com> > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > > Thanks for this new runtime test! :-) > > Would it make sense to apply just this test to master? Or does it really > need the version bump first? > > Regards, > Yann E. MORIN. > > > --- > > .gitlab-ci.yml | 2 + > > support/testing/tests/init/test_openrc.py | 51 +++++++++++++++++++++++ > > 2 files changed, 53 insertions(+) > > create mode 100644 support/testing/tests/init/test_openrc.py > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > index b4dad3173e..382a7c59b2 100644 > > --- a/.gitlab-ci.yml > > +++ b/.gitlab-ci.yml > > @@ -368,6 +368,8 @@ tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test } > > tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test } > > tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test } > > tests.init.test_none.TestInitSystemNone: { extends: .runtime_test } > > +tests.init.test_openrc.TestInitSystemOpenrcRoFull: { extends: .runtime_test } > > +tests.init.test_openrc.TestInitSystemOpenrcRwFull: { extends: .runtime_test } > > tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test } > > tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test } > > tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test } > > diff --git a/support/testing/tests/init/test_openrc.py b/support/testing/tests/init/test_openrc.py > > new file mode 100644 > > index 0000000000..23669a9572 > > --- /dev/null > > +++ b/support/testing/tests/init/test_openrc.py > > @@ -0,0 +1,51 @@ > > +import infra.basetest > > +from tests.init.base import InitSystemBase as InitSystemBase > > + > > + > > +class InitSystemOpenrcBase(InitSystemBase): > > + config = \ > > + """ > > + BR2_arm=y > > + BR2_TOOLCHAIN_EXTERNAL=y > > + BR2_INIT_OPENRC=y > > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > > + BR2_LINUX_KERNEL=y > > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7" > > + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > > + BR2_LINUX_KERNEL_DTS_SUPPORT=y > > + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > > + # BR2_TARGET_ROOTFS_TAR is not set > > + """ > > + > > + def check_init(self): > > + super(InitSystemOpenrcBase, self) > > + > > + # Test all services are OK > > + output, _ = self.emulator.run("rc-status -c") > > + self.assertEqual(len(output), 0) > > + > > + > > +class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase): > > + config = InitSystemOpenrcBase.config + \ > > + """ > > + BR2_SYSTEM_DHCP="eth0" > > + # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set > > + BR2_TARGET_ROOTFS_SQUASHFS=y > > + """ > > + > > + def test_run(self): > > + self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") > > + self.check_init() > > + > > + > > +class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase): > > + config = InitSystemOpenrcBase.config + \ > > + """ > > + BR2_SYSTEM_DHCP="eth0" > > + BR2_TARGET_ROOTFS_EXT2=y > > + """ > > + > > + def test_run(self): > > + self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") > > + self.check_init() > > -- > > 2.18.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot@busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot The test is very simple and does not depend on any new openrc feature. I think it's safe to apply it on master.
Carlos, All, On 2020-03-01 12:17 -0300, unixmania@gmail.com spake thusly: > From: Adam Duskett <Aduskett@gmail.com> > > Two simple tests to ensure that openrc boots without any services crashing > with a read only and a read write filing system. > > Signed-off-by: Adam Duskett <Aduskett@gmail.com> > Signed-off-by: Carlos Santos <unixmania@gmail.com> Applied to master, but see some comments below... > --- > .gitlab-ci.yml | 2 + > support/testing/tests/init/test_openrc.py | 51 +++++++++++++++++++++++ > 2 files changed, 53 insertions(+) > create mode 100644 support/testing/tests/init/test_openrc.py > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index b4dad3173e..382a7c59b2 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -368,6 +368,8 @@ tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test } > tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test } > tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test } > tests.init.test_none.TestInitSystemNone: { extends: .runtime_test } > +tests.init.test_openrc.TestInitSystemOpenrcRoFull: { extends: .runtime_test } > +tests.init.test_openrc.TestInitSystemOpenrcRwFull: { extends: .runtime_test } > tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test } > tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test } > tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test } > diff --git a/support/testing/tests/init/test_openrc.py b/support/testing/tests/init/test_openrc.py > new file mode 100644 > index 0000000000..23669a9572 > --- /dev/null > +++ b/support/testing/tests/init/test_openrc.py > @@ -0,0 +1,51 @@ > +import infra.basetest > +from tests.init.base import InitSystemBase as InitSystemBase > + > + > +class InitSystemOpenrcBase(InitSystemBase): > + config = \ > + """ > + BR2_arm=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_INIT_OPENRC=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y Why can't we use the pre-built kernel? > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7" > + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" > + BR2_LINUX_KERNEL_DTS_SUPPORT=y > + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" > + # BR2_TARGET_ROOTFS_TAR is not set > + """ > + > + def check_init(self): > + super(InitSystemOpenrcBase, self) I'm not sure what this is supposed to achieve... Did you forget to append the actual call to the super's check_init(): super(InitSystemOpenrcBase, self).check_init('/sbin/openrc-init') I've fixed that and applied, but I'd still like some feedback at least on the kernel question, above. Regards, Yann E. MORIN. > + # Test all services are OK > + output, _ = self.emulator.run("rc-status -c") > + self.assertEqual(len(output), 0) > + > + > +class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase): > + config = InitSystemOpenrcBase.config + \ > + """ > + BR2_SYSTEM_DHCP="eth0" > + # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set > + BR2_TARGET_ROOTFS_SQUASHFS=y > + """ > + > + def test_run(self): > + self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") > + self.check_init() > + > + > +class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase): > + config = InitSystemOpenrcBase.config + \ > + """ > + BR2_SYSTEM_DHCP="eth0" > + BR2_TARGET_ROOTFS_EXT2=y > + """ > + > + def test_run(self): > + self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") > + self.check_init() > -- > 2.18.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4dad3173e..382a7c59b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -368,6 +368,8 @@ tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test } tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test } tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test } tests.init.test_none.TestInitSystemNone: { extends: .runtime_test } +tests.init.test_openrc.TestInitSystemOpenrcRoFull: { extends: .runtime_test } +tests.init.test_openrc.TestInitSystemOpenrcRwFull: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test } diff --git a/support/testing/tests/init/test_openrc.py b/support/testing/tests/init/test_openrc.py new file mode 100644 index 0000000000..23669a9572 --- /dev/null +++ b/support/testing/tests/init/test_openrc.py @@ -0,0 +1,51 @@ +import infra.basetest +from tests.init.base import InitSystemBase as InitSystemBase + + +class InitSystemOpenrcBase(InitSystemBase): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_INIT_OPENRC=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def check_init(self): + super(InitSystemOpenrcBase, self) + + # Test all services are OK + output, _ = self.emulator.run("rc-status -c") + self.assertEqual(len(output), 0) + + +class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase): + config = InitSystemOpenrcBase.config + \ + """ + BR2_SYSTEM_DHCP="eth0" + # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set + BR2_TARGET_ROOTFS_SQUASHFS=y + """ + + def test_run(self): + self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") + self.check_init() + + +class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase): + config = InitSystemOpenrcBase.config + \ + """ + BR2_SYSTEM_DHCP="eth0" + BR2_TARGET_ROOTFS_EXT2=y + """ + + def test_run(self): + self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") + self.check_init()