diff --git a/meta-oe/recipes-connectivity/conserver/conserver/0001-test-don-t-let-reinitcheck-race-the-console-down-tes.patch b/meta-oe/recipes-connectivity/conserver/conserver/0001-test-don-t-let-reinitcheck-race-the-console-down-tes.patch new file mode 100644 index 0000000000..0bb7f99bd1 --- /dev/null +++ b/meta-oe/recipes-connectivity/conserver/conserver/0001-test-don-t-let-reinitcheck-race-the-console-down-tes.patch @@ -0,0 +1,37 @@ +From: Khem Raj +Date: Sun, 27 Sep 2026 14:15:00 -0700 +Subject: [PATCH] test: don't let reinitcheck race the console-down test + +test1.cf sets "reinitcheck 1s", added to exercise the seconds unit. +A reinit check brings back every console that is down, including one +taken down on purpose, so test #4 ("cd") and test #5, which expects the +console to still be down, race it: if the second console client does +not attach and query the state within a second, conserver has already +reinitialized the console and test #5 fails with + + -[`shell' -- console is down] + [Enter `^Ec?' for help] + +This shows up readily on loaded or emulated targets. Use 60s instead: +the seconds unit is still parsed and the check can no longer fire +during the test run. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + test/test1.cf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test1.cf b/test/test1.cf +index 781267e..b02a9ba 100644 +--- a/test/test1.cf ++++ b/test/test1.cf +@@ -8,7 +8,7 @@ default * { + include full; + } + config * { +- reinitcheck 1s; ++ reinitcheck 60s; + } + break 5 { + string "\rtest\r"; diff --git a/meta-oe/recipes-connectivity/conserver/conserver_8.3.0.bb b/meta-oe/recipes-connectivity/conserver/conserver_8.3.0.bb index 8ca5d9c95d..8a841bf97e 100644 --- a/meta-oe/recipes-connectivity/conserver/conserver_8.3.0.bb +++ b/meta-oe/recipes-connectivity/conserver/conserver_8.3.0.bb @@ -23,6 +23,7 @@ SRC_URI = "\ git://github.com/bstansell/conserver;protocol=https;branch=master;tag=v${PV} \ file://conserver.service \ file://run-ptest \ + file://0001-test-don-t-let-reinitcheck-race-the-console-down-tes.patch \ " SRCREV = "fe9aac337554f95721dc9f3da721092a81092089"