diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-15 14:38:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:13:03 +0000 |
| commit | d58fe9d352ae7de857e7f55b88f6e7d35b2cd706 (patch) | |
| tree | 9222f7159e7c0bf74f844cc36792468fe527c50a | |
| parent | 6c930a8f5c11947c3b916efe23f33af462701bee (diff) | |
| download | openembedded-core-contrib-d58fe9d352ae7de857e7f55b88f6e7d35b2cd706.tar.gz | |
testimage/testsdk/selftest: Avoid platform.distro_identifier deprecation warnings
Use our own lsb function instead as used elsewhere by the codebase.
(From OE-Core rev: acac45a6fd604d28ef7c23d67482af3d7e8bcfe3)
(From OE-Core rev: 570256a64af5a3fa994a20a5cc4c74d59ffc361f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/testimage.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/testsdk.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/context.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index a9e8b499dd..3e4ffcaca8 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -141,7 +141,7 @@ def get_testimage_configuration(d, test_type, machine): 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"), 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"), 'STARTTIME': d.getVar("DATETIME"), - 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'), + 'HOST_DISTRO': oe.lsb.distro_identifier().replace(' ', '-'), 'LAYERS': get_layers(d.getVar("BBLAYERS"))} return configuration get_testimage_configuration[vardepsexclude] = "DATETIME" diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 6981d40be1..4374d8775b 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -23,7 +23,7 @@ def get_sdk_configuration(d, test_type): 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"), 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"), 'STARTTIME': d.getVar("DATETIME"), - 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'), + 'HOST_DISTRO': oe.lsb.distro_identifier().replace(' ', '-'), 'LAYERS': get_layers(d.getVar("BBLAYERS"))} return configuration get_sdk_configuration[vardepsexclude] = "DATETIME" diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 9a56888c2f..da7f26b30f 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -11,6 +11,7 @@ from shutil import copyfile from random import choice import oeqa +import oe from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.exception import OEQAPreRun, OEQATestNotFound @@ -216,7 +217,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): configuration = {'TEST_TYPE': 'oeselftest', 'STARTTIME': args.test_start_time, 'MACHINE': self.tc.td["MACHINE"], - 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'), + 'HOST_DISTRO': oe.lsb.distro_identifier().replace(' ', '-'), 'HOST_NAME': metadata['hostname'], 'LAYERS': metadata['layers']} return configuration |