diff options
author | Ross Burton <ross.burton@arm.com> | 2023-07-05 11:50:01 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-08-27 10:54:46 -1000 |
commit | 02cfe361d64793e86f7cee7d157c53a012b5c3b1 (patch) | |
tree | ca5941582322183a2bbd6aeecdc4abe48749f816 | |
parent | 8ae48ddf5e1f01e8d738c8303796d112bba7e39e (diff) | |
download | poky-02cfe361d64793e86f7cee7d157c53a012b5c3b1.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: 2be0f2c62fb893f093091cbb30967f32f9d3165b)
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 2b6cfe5ff2..203fcc8505 100644 --- a/meta/lib/oeqa/runtime/cases/rpm.py +++ b/meta/lib/oeqa/runtime/cases/rpm.py | |||
@@ -57,8 +57,8 @@ class RpmBasicTest(OERuntimeTestCase): | |||
57 | return | 57 | return |
58 | time.sleep(1) | 58 | time.sleep(1) |
59 | user_pss = [ps for ps in output.split("\n") if u + ' ' in ps] | 59 | user_pss = [ps for ps in output.split("\n") if u + ' ' in ps] |
60 | msg = "There're %s 's process(es) still running: %s".format(u, "\n".join(user_pss)) | 60 | msg = "User %s has processes still running: %s" % (u, "\n".join(user_pss)) |
61 | assertTrue(True, msg=msg) | 61 | self.fail(msg=msg) |
62 | 62 | ||
63 | def unset_up_test_user(u): | 63 | def unset_up_test_user(u): |
64 | # ensure no test1 process in running | 64 | # ensure no test1 process in running |