diff options
| author | Ross Burton <ross.burton@arm.com> | 2023-07-05 11:50:01 +0100 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-08-01 06:17:28 -1000 |
| commit | 1b61d1fedb620eafc872686c842be2ecfabe9684 (patch) | |
| tree | 043fc436e0bafb9d0e311433ccc7952ae5f31c56 | |
| parent | db2effd46d03eb3d92977f791bed26995bb8aad9 (diff) | |
| download | poky-1b61d1fedb620eafc872686c842be2ecfabe9684.tar.gz | |
oeqa/runtime/cases/rpm: fix wait_for_no_process_for_user failure case
str.format() doesn't use % notation, update the formatting to work.
assertTrue() is a member of self not a global, and assertTrue(True) will
always pass. Change this to just self.fail() as this is the failure case.
(From OE-Core rev: c88b9eedc81529c67f2e628ae5e7325daff2535e)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 017f3a0b1265c1a3b69c20bdb56bbf446111977e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/rpm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/cases/rpm.py b/meta/lib/oeqa/runtime/cases/rpm.py index fa86eb0537..a4ba4e6769 100644 --- a/meta/lib/oeqa/runtime/cases/rpm.py +++ b/meta/lib/oeqa/runtime/cases/rpm.py | |||
| @@ -59,8 +59,8 @@ class RpmBasicTest(OERuntimeTestCase): | |||
| 59 | return | 59 | return |
| 60 | time.sleep(1) | 60 | time.sleep(1) |
| 61 | user_pss = [ps for ps in output.split("\n") if u + ' ' in ps] | 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)) | 62 | msg = "User %s has processes still running: %s" % (u, "\n".join(user_pss)) |
| 63 | assertTrue(True, msg=msg) | 63 | self.fail(msg=msg) |
| 64 | 64 | ||
| 65 | def unset_up_test_user(u): | 65 | def unset_up_test_user(u): |
| 66 | # ensure no test1 process in running | 66 | # ensure no test1 process in running |