diff mbox series

[2/5] support/testing: add s6 tests

Message ID VwWJsppMN7KalptbUD3cY22Vr9WusoGGsG2irkxRE@cp3-web-033.plabs.ch
State Accepted
Headers show
Series Runtime tests for skaware packages | expand

Commit Message

D. Olsson May 2, 2021, 8:17 a.m. UTC 
Test that directory scanning and supervision is working.

Signed-off-by: Dick Olsson <hi@senzilla.io>
---
 support/testing/tests/package/test_s6.py | 54 ++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 support/testing/tests/package/test_s6.py

Comments

Arnout Vandecappelle May 4, 2021, 7:50 p.m. UTC | #1 
On 02/05/2021 10:17, Dick Olsson via buildroot wrote:
> Test that directory scanning and supervision is working.
> 
> Signed-off-by: Dick Olsson <hi@senzilla.io>
> ---
>  support/testing/tests/package/test_s6.py | 54 ++++++++++++++++++++++++
>  1 file changed, 54 insertions(+)
>  create mode 100644 support/testing/tests/package/test_s6.py
> 
> diff --git a/support/testing/tests/package/test_s6.py b/support/testing/tests/package/test_s6.py
> new file mode 100644
> index 0000000000..4c6f3c0976
> --- /dev/null
> +++ b/support/testing/tests/package/test_s6.py
> @@ -0,0 +1,54 @@
> +import os
> +
> +import infra.basetest
> +
> +
> +class TestS6(infra.basetest.BRTest):
> +    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + """
> +    BR2_PACKAGE_S6=y
> +    BR2_TARGET_ROOTFS_CPIO=y
> +    # BR2_TARGET_ROOTFS_TAR is not set
> +    """

 We use the following type of indentation for these:

    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
        """
        BR2_PACKAGE_S6=y
        BR2_TARGET_ROOTFS_CPIO=y
        # BR2_TARGET_ROOTFS_TAR is not set
        """

> +
> +    def test_run(self):
> +        img = os.path.join(self.builddir, "images", "rootfs.cpio")
> +        self.emulator.boot(arch="armv5",
> +                           kernel="builtin",
> +                           options=["-initrd", img])
> +        self.emulator.login()
> +
> +        _, exit_code = self.emulator.run("s6-svscan -h")
> +        self.assertEqual(exit_code, 100)
> +
> +        script = """
> +#!/bin/execlineb -P
> +s6-ipcserver-socketbinder /tmp/socket
> +s6-ipcserverd
> +cat
> +"""

 Lack of indentation here is icky. I properly indented it and used
textwrap.dedent to remove indentation again.

> +
> +        # Set up scanning and service directories
> +        self.emulator.run("mkdir -p source/testsv")
> +        self.emulator.run("cat > source/testsv/run <<EOF" + script + "EOF")
> +        self.emulator.run("chmod +x source/testsv/run")
> +        _, exit_code = self.emulator.run("s6-svok source/testsv")
> +        self.assertEqual(exit_code, 1)
> +
> +        # Run a scan and start all services
> +        self.emulator.run("s6-svscan source &")
> +        self.emulator.run("sleep 2")
> +        _, exit_code = self.emulator.run("s6-svok source/testsv")
> +        self.assertEqual(exit_code, 0)
> +
> +        # Test a running service
> +        cmd = "echo foobar | s6-ipcclient /tmp/socket s6-ioconnect -67"
> +        output, exit_code = self.emulator.run(cmd)
> +        self.assertEqual(exit_code, 0)
> +        self.assertEqual(output[0], "foobar")
> +
> +        # Terminate all services
> +        _, exit_code = self.emulator.run("s6-svscanctl -t source")
> +        self.assertEqual(exit_code, 0)
> +        self.emulator.run("sleep 2")
> +        _, exit_code = self.emulator.run("s6-svok source/testsv")
> +        self.assertEqual(exit_code, 1)

 I can't say I really understand what's going on here, but it looks OK so
applied to master, thanks.

 Regards,
 Arnout
diff mbox series

Patch

diff --git a/support/testing/tests/package/test_s6.py b/support/testing/tests/package/test_s6.py
new file mode 100644
index 0000000000..4c6f3c0976
--- /dev/null
+++ b/support/testing/tests/package/test_s6.py
@@ -0,0 +1,54 @@ 
+import os
+
+import infra.basetest
+
+
+class TestS6(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + """
+    BR2_PACKAGE_S6=y
+    BR2_TARGET_ROOTFS_CPIO=y
+    # BR2_TARGET_ROOTFS_TAR is not set
+    """
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv5",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+        _, exit_code = self.emulator.run("s6-svscan -h")
+        self.assertEqual(exit_code, 100)
+
+        script = """
+#!/bin/execlineb -P
+s6-ipcserver-socketbinder /tmp/socket
+s6-ipcserverd
+cat
+"""
+
+        # Set up scanning and service directories
+        self.emulator.run("mkdir -p source/testsv")
+        self.emulator.run("cat > source/testsv/run <<EOF" + script + "EOF")
+        self.emulator.run("chmod +x source/testsv/run")
+        _, exit_code = self.emulator.run("s6-svok source/testsv")
+        self.assertEqual(exit_code, 1)
+
+        # Run a scan and start all services
+        self.emulator.run("s6-svscan source &")
+        self.emulator.run("sleep 2")
+        _, exit_code = self.emulator.run("s6-svok source/testsv")
+        self.assertEqual(exit_code, 0)
+
+        # Test a running service
+        cmd = "echo foobar | s6-ipcclient /tmp/socket s6-ioconnect -67"
+        output, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, 0)
+        self.assertEqual(output[0], "foobar")
+
+        # Terminate all services
+        _, exit_code = self.emulator.run("s6-svscanctl -t source")
+        self.assertEqual(exit_code, 0)
+        self.emulator.run("sleep 2")
+        _, exit_code = self.emulator.run("s6-svok source/testsv")
+        self.assertEqual(exit_code, 1)