mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 13:49:49 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/rpm.py: Increase timeout and add debug output

Browse Source 
[Yocto #14346]
Systemd may be slow in killing pam session sometimes [1][2]. It may cause rpm
test to fail because there's process (sd_pam) running and own by "test1" user
after timeout.
Increasing timeout to 2 mins and assert earlier with debug output if
there's such process(es). If increasing of timeout doesn't help we may
want to force deletion of the user as [2] suggests.

[1] https://github.com/systemd/systemd/issues/8598
[2] https://access.redhat.com/solutions/6969188

(From OE-Core rev: ed2c94ae744331a1e977dd4e02005390a84cd5be)

Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 972fcc0ed1e0d36c3470071a9c667c5327c1ef78)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pavel Zhukov
2022-12-25 13:46:58 +01:00
committed by Richard Purdie
parent af8a7f0eb7
commit 39715cc4d6
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/runtime/cases/rpm.py
+11 -12
View File
@@ -51,21 +51,20 @@ class RpmBasicTest(OERuntimeTestCase):
msg = 'status: %s. Cannot run rpm -qa: %s' % (status, output) msg = 'status: %s. Cannot run rpm -qa: %s' % (status, output)
self.assertEqual(status, 0, msg=msg) self.assertEqual(status, 0, msg=msg)
def check_no_process_for_user(u): def wait_for_no_process_for_user(u, timeout = 120):
_, output = self.target.run(self.tc.target_cmds['ps']) timeout_at = time.time() + timeout
if u + ' ' in output: while time.time() < timeout_at:
return False _, output = self.target.run(self.tc.target_cmds['ps'])
else: if u + ' ' not in output:
return True return
time.sleep(1)
user_pss = [ps for ps in output.split("\n") if u + ' ' in ps]
msg = "There're %s 's process(es) still running: %s".format(u, "\n".join(user_pss))
assertTrue(True, msg=msg)
def unset_up_test_user(u): def unset_up_test_user(u):
# ensure no test1 process in running # ensure no test1 process in running
timeout = time.time() + 30 wait_for_no_process_for_user(u)
while time.time() < timeout:
if check_no_process_for_user(u):
break
else:
time.sleep(1)
status, output = self.target.run('userdel -r %s' % u) status, output = self.target.run('userdel -r %s' % u)
msg = 'Failed to erase user: %s' % output msg = 'Failed to erase user: %s' % output
self.assertTrue(status == 0, msg=msg) self.assertTrue(status == 0, msg=msg)