diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2017-01-31 15:05:54 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 23:27:43 +0000 |
| commit | 9923e3cdb58c2b3c54ec5fe99b2cec4cdc9fff92 (patch) | |
| tree | 2464cd2608d1a6fb1566ac9cbcc50057b5874ffd | |
| parent | 42f3026b39519ba98ae3153329622ce670d57c09 (diff) | |
| download | openembedded-core-9923e3cdb58c2b3c54ec5fe99b2cec4cdc9fff92.tar.gz openembedded-core-9923e3cdb58c2b3c54ec5fe99b2cec4cdc9fff92.tar.bz2 openembedded-core-9923e3cdb58c2b3c54ec5fe99b2cec4cdc9fff92.zip | |
oeqa/runtime/cases: Rename syslog module to oe_syslog
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]
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>
| -rw-r--r-- | meta/classes/testimage.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/oe_syslog.py (renamed from meta/lib/oeqa/runtime/cases/syslog.py) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 7495fe1e14..c6e4cec426 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -38,7 +38,7 @@ TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged" RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}" SYSTEMDSUITE = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" MINTESTSUITE = "ping" -NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog ${SYSTEMDSUITE}" +NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}" DEVTESTSUITE = "gcc kernelmodule ldd" DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto" diff --git a/meta/lib/oeqa/runtime/cases/syslog.py b/meta/lib/oeqa/runtime/cases/oe_syslog.py index 537c519482..005b6978d9 100644 --- a/meta/lib/oeqa/runtime/cases/syslog.py +++ b/meta/lib/oeqa/runtime/cases/oe_syslog.py @@ -18,7 +18,7 @@ class SyslogTest(OERuntimeTestCase): class SyslogTestConfig(OERuntimeTestCase): @OETestID(1149) - @OETestDepends(['syslog.SyslogTest.test_syslog_running']) + @OETestDepends(['oe_syslog.SyslogTest.test_syslog_running']) def test_syslog_logger(self): status, output = self.target.run('logger foobar') msg = "Can't log into syslog. Output: %s " % output @@ -35,7 +35,7 @@ class SyslogTestConfig(OERuntimeTestCase): self.assertEqual(status, 0, msg=msg) @OETestID(1150) - @OETestDepends(['syslog.SyslogTest.test_syslog_running']) + @OETestDepends(['oe_syslog.SyslogTest.test_syslog_running']) def test_syslog_restart(self): if "systemd" != self.tc.td.get("VIRTUAL-RUNTIME_init_manager", ""): (_, _) = self.target.run('/etc/init.d/syslog restart') @@ -44,7 +44,7 @@ class SyslogTestConfig(OERuntimeTestCase): @OETestID(202) - @OETestDepends(['syslog.SyslogTestConfig.test_syslog_logger']) + @OETestDepends(['oe_syslog.SyslogTestConfig.test_syslog_logger']) @OEHasPackage(["!sysklogd", "busybox"]) @skipIfDataVar('VIRTUAL-RUNTIME_init_manager', 'systemd', 'Not appropiate for systemd image') |