mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/runtime/cases: Rename syslog module to oe_syslog

Browse Source 
Debian based distros has a builtin syslog module so when
try to load tests using unittest it references the builtin
module instead of runtime/cases.

[YOCTO #10964]

(From OE-Core rev: 9923e3cdb58c2b3c54ec5fe99b2cec4cdc9fff92)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2017-01-31 15:05:54 -06:00
committed by Richard Purdie
parent 3eef8f7955
commit 90b4e075f4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/testimage.bbclass
+1 -1
View File
@@ -38,7 +38,7 @@ TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}" RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}"
SYSTEMDSUITE = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" SYSTEMDSUITE = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
MINTESTSUITE = "ping" MINTESTSUITE = "ping"
NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog ${SYSTEMDSUITE}" NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}"
DEVTESTSUITE = "gcc kernelmodule ldd" DEVTESTSUITE = "gcc kernelmodule ldd"
DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto" DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto"
meta/lib/oeqa/runtime/cases/syslog.py → meta/lib/oeqa/runtime/cases/oe_syslog.py
+3 -3
View File
@@ -18,7 +18,7 @@ class SyslogTest(OERuntimeTestCase):
class SyslogTestConfig(OERuntimeTestCase): class SyslogTestConfig(OERuntimeTestCase):
@OETestID(1149) @OETestID(1149)
@OETestDepends(['syslog.SyslogTest.test_syslog_running']) @OETestDepends(['oe_syslog.SyslogTest.test_syslog_running'])
def test_syslog_logger(self): def test_syslog_logger(self):
status, output = self.target.run('logger foobar') status, output = self.target.run('logger foobar')
msg = "Can't log into syslog. Output: %s " % output msg = "Can't log into syslog. Output: %s " % output
@@ -35,7 +35,7 @@ class SyslogTestConfig(OERuntimeTestCase):
self.assertEqual(status, 0, msg=msg) self.assertEqual(status, 0, msg=msg)
@OETestID(1150) @OETestID(1150)
@OETestDepends(['syslog.SyslogTest.test_syslog_running']) @OETestDepends(['oe_syslog.SyslogTest.test_syslog_running'])
def test_syslog_restart(self): def test_syslog_restart(self):
if "systemd" != self.tc.td.get("VIRTUAL-RUNTIME_init_manager", ""): if "systemd" != self.tc.td.get("VIRTUAL-RUNTIME_init_manager", ""):
(_, _) = self.target.run('/etc/init.d/syslog restart') (_, _) = self.target.run('/etc/init.d/syslog restart')
@@ -44,7 +44,7 @@ class SyslogTestConfig(OERuntimeTestCase):
@OETestID(202) @OETestID(202)
@OETestDepends(['syslog.SyslogTestConfig.test_syslog_logger']) @OETestDepends(['oe_syslog.SyslogTestConfig.test_syslog_logger'])
@OEHasPackage(["!sysklogd", "busybox"]) @OEHasPackage(["!sysklogd", "busybox"])
@skipIfDataVar('VIRTUAL-RUNTIME_init_manager', 'systemd', @skipIfDataVar('VIRTUAL-RUNTIME_init_manager', 'systemd',
'Not appropiate for systemd image') 'Not appropiate for systemd image')