diff options
Diffstat (limited to 'meta/lib/oeqa/runtime/cases/rpm.py')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/rpm.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py b/meta/lib/oeqa/runtime/cases/rpm.py index e3cd818b2b..fa86eb0537 100644 --- a/meta/lib/oeqa/runtime/cases/rpm.py +++ b/meta/lib/oeqa/runtime/cases/rpm.py | |||
@@ -51,21 +51,20 @@ class RpmBasicTest(OERuntimeTestCase): | |||
51 | msg = 'status: %s. Cannot run rpm -qa: %s' % (status, output) | 51 | msg = 'status: %s. Cannot run rpm -qa: %s' % (status, output) |
52 | self.assertEqual(status, 0, msg=msg) | 52 | self.assertEqual(status, 0, msg=msg) |
53 | 53 | ||
54 | def check_no_process_for_user(u): | 54 | def wait_for_no_process_for_user(u, timeout = 120): |
55 | _, output = self.target.run(self.tc.target_cmds['ps']) | 55 | timeout_at = time.time() + timeout |
56 | if u + ' ' in output: | 56 | while time.time() < timeout_at: |
57 | return False | 57 | _, output = self.target.run(self.tc.target_cmds['ps']) |
58 | else: | 58 | if u + ' ' not in output: |
59 | return True | 59 | return |
60 | time.sleep(1) | ||
61 | user_pss = [ps for ps in output.split("\n") if u + ' ' in ps] | ||
62 | msg = "There're %s 's process(es) still running: %s".format(u, "\n".join(user_pss)) | ||
63 | assertTrue(True, msg=msg) | ||
60 | 64 | ||
61 | def unset_up_test_user(u): | 65 | def unset_up_test_user(u): |
62 | # ensure no test1 process in running | 66 | # ensure no test1 process in running |
63 | timeout = time.time() + 30 | 67 | wait_for_no_process_for_user(u) |
64 | while time.time() < timeout: | ||
65 | if check_no_process_for_user(u): | ||
66 | break | ||
67 | else: | ||
68 | time.sleep(1) | ||
69 | status, output = self.target.run('userdel -r %s' % u) | 68 | status, output = self.target.run('userdel -r %s' % u) |
70 | msg = 'Failed to erase user: %s' % output | 69 | msg = 'Failed to erase user: %s' % output |
71 | self.assertTrue(status == 0, msg=msg) | 70 | self.assertTrue(status == 0, msg=msg) |