[Buildroot] [PATCH 0/2] support/testing: fix TestInitSystemNone for non-login shell

[Buildroot] [PATCH 0/2] support/testing: fix TestInitSystemNone for non-login shell

[Brandon Maier via buildroot]

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
---
Brandon Maier (2):
      support/testing/infra/emulator.py: support init=/bin/sh
      support/testing: fix TestInitSystemNone for non-login shell

 support/testing/infra/emulator.py       | 3 +++
 support/testing/tests/init/test_none.py | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
base-commit: 51a58ff0624f62ca0fa0ca6494928e8bd1410f69
change-id: 20240715-support-testing-fix-testinitsystemnone-0afe7bc3ade8

Best regards,
-- 
Brandon Maier <brandon.maier@collins.com>

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/2] support/testing/infra/emulator.py: support init=/bin/sh

[Brandon Maier via buildroot]

The TestInitSystemNone bypasses the normal init and instead launches
directly into a shell. So it needs to bypass the login code and go
directly to a shell.

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
---
 support/testing/infra/emulator.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py
index 950843e37d..be26d4caa4 100644
--- a/support/testing/infra/emulator.py
+++ b/support/testing/infra/emulator.py
@@ -133,6 +133,9 @@ class Emulator(object):
             self.qemu.expect("Password:")
             self.qemu.sendline(password)
 
+        self.connect_shell()
+
+    def connect_shell(self):
         extra_init_cmd = " && ".join([
             'export PAGER=cat',
             'dmesg -n 1',

-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] support/testing: fix TestInitSystemNone for non-login shell

[Brandon Maier via buildroot]

This test started failing at commit
0cad947b964be5612a182413da136fcf0dc5a1f2
"support/testing/infra/emulator.py: fix qemu prompt detection" with the
error message

  AttributeError: 'NoneType' object has no attribute 'run_command'

This is because we changed emulator.run() so that emulator.login() must
be called first. But this test skips the login and goes directly to a
shell. Use the new emualtor.connect_shell() function which prepares the
shell without logging in.

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
---
 support/testing/tests/init/test_none.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/support/testing/tests/init/test_none.py b/support/testing/tests/init/test_none.py
index fc4a46efd9..5bfcc3d5c9 100644
--- a/support/testing/tests/init/test_none.py
+++ b/support/testing/tests/init/test_none.py
@@ -18,10 +18,8 @@ class TestInitSystemNone(InitSystemBase):
         if index != 0:
             self.emulator.logfile.write("==> System does not boot")
             raise SystemError("System does not boot")
-        index = self.emulator.qemu.expect(["#", pexpect.TIMEOUT], timeout=60)
-        if index != 0:
-            self.emulator.logfile.write("==> System does not boot")
-            raise SystemError("System does not boot")
+
+        self.emulator.connect_shell()
 
         out, exit_code = self.emulator.run("sh -c 'echo $PPID'")
         self.assertEqual(exit_code, 0)

-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 0/2] support/testing: fix TestInitSystemNone for non-login shell

[Thomas Petazzoni via buildroot]

On Mon, 15 Jul 2024 14:50:38 +0000
Brandon Maier via buildroot <buildroot@buildroot.org> wrote:

> Brandon Maier (2):
>       support/testing/infra/emulator.py: support init=/bin/sh
>       support/testing: fix TestInitSystemNone for non-login shell

Both applied, thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot