diff options
| author | Jon Mason <jdmason@kudzu.us> | 2021-04-14 11:19:16 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-30 14:37:25 +0100 |
| commit | 80257e06f5bc3aff6b4a5cd71c167e7cc4ca99c9 (patch) | |
| tree | 0230c23b3b16d91d2cad1b6bfd1d9378997b2403 /meta/lib/oeqa/runtime | |
| parent | 7c25e4c53c6e6d7509d21f8c10fabb66fa1bf2b5 (diff) | |
| download | poky-80257e06f5bc3aff6b4a5cd71c167e7cc4ca99c9.tar.gz | |
oeqa/runtime: space needed
Messages are currently being printed as:
Test requires dropbear, oropenssh-sshd to be installed
but should be
Test requires dropbear, or openssh-sshd to be installed
Adding the space after the 'or' corrects this.
(From OE-Core rev: f85c993bc4535dc42b89e87050d43c018c100f58)
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 51596e0f8cebe1607ab64ffb018d51e815c0ee4b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/runtime')
| -rw-r--r-- | meta/lib/oeqa/runtime/decorator/package.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py index 57178655cc..2d7e174dbf 100644 --- a/meta/lib/oeqa/runtime/decorator/package.py +++ b/meta/lib/oeqa/runtime/decorator/package.py | |||
| @@ -45,14 +45,14 @@ class OEHasPackage(OETestDecorator): | |||
| 45 | msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs) | 45 | msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs) |
| 46 | self.logger.debug(msg) | 46 | self.logger.debug(msg) |
| 47 | if not self.case.tc.image_packages.isdisjoint(unneed_pkgs): | 47 | if not self.case.tc.image_packages.isdisjoint(unneed_pkgs): |
| 48 | msg = "Test can't run with %s installed" % ', or'.join(unneed_pkgs) | 48 | msg = "Test can't run with %s installed" % ', or '.join(unneed_pkgs) |
| 49 | self._decorator_fail(msg) | 49 | self._decorator_fail(msg) |
| 50 | 50 | ||
| 51 | if need_pkgs: | 51 | if need_pkgs: |
| 52 | msg = 'Checking if at least one of %s is installed' % ', '.join(need_pkgs) | 52 | msg = 'Checking if at least one of %s is installed' % ', '.join(need_pkgs) |
| 53 | self.logger.debug(msg) | 53 | self.logger.debug(msg) |
| 54 | if self.case.tc.image_packages.isdisjoint(need_pkgs): | 54 | if self.case.tc.image_packages.isdisjoint(need_pkgs): |
| 55 | msg = "Test requires %s to be installed" % ', or'.join(need_pkgs) | 55 | msg = "Test requires %s to be installed" % ', or '.join(need_pkgs) |
| 56 | self._decorator_fail(msg) | 56 | self._decorator_fail(msg) |
| 57 | 57 | ||
| 58 | def _decorator_fail(self, msg): | 58 | def _decorator_fail(self, msg): |