summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2017-01-31 15:05:54 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 23:27:47 +0000
commit90b4e075f4e0c180f4e52e29c4443c6294687363 (patch)
tree5b2c13a30d3fa937b95d522d37d47b43821767fb
parent3eef8f7955d09063b1ebfd7ea5cc74ee67fcc4a2 (diff)
downloadpoky-90b4e075f4e0c180f4e52e29c4443c6294687363.tar.gz
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] (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>
-rw-r--r--meta/classes/testimage.bbclass2
-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"
38RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}" 38RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}"
39SYSTEMDSUITE = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 39SYSTEMDSUITE = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
40MINTESTSUITE = "ping" 40MINTESTSUITE = "ping"
41NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog ${SYSTEMDSUITE}" 41NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}"
42DEVTESTSUITE = "gcc kernelmodule ldd" 42DEVTESTSUITE = "gcc kernelmodule ldd"
43 43
44DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto" 44DEFAULT_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):
18class SyslogTestConfig(OERuntimeTestCase): 18class SyslogTestConfig(OERuntimeTestCase):
19 19
20 @OETestID(1149) 20 @OETestID(1149)
21 @OETestDepends(['syslog.SyslogTest.test_syslog_running']) 21 @OETestDepends(['oe_syslog.SyslogTest.test_syslog_running'])
22 def test_syslog_logger(self): 22 def test_syslog_logger(self):
23 status, output = self.target.run('logger foobar') 23 status, output = self.target.run('logger foobar')
24 msg = "Can't log into syslog. Output: %s " % output 24 msg = "Can't log into syslog. Output: %s " % output
@@ -35,7 +35,7 @@ class SyslogTestConfig(OERuntimeTestCase):
35 self.assertEqual(status, 0, msg=msg) 35 self.assertEqual(status, 0, msg=msg)
36 36
37 @OETestID(1150) 37 @OETestID(1150)
38 @OETestDepends(['syslog.SyslogTest.test_syslog_running']) 38 @OETestDepends(['oe_syslog.SyslogTest.test_syslog_running'])
39 def test_syslog_restart(self): 39 def test_syslog_restart(self):
40 if "systemd" != self.tc.td.get("VIRTUAL-RUNTIME_init_manager", ""): 40 if "systemd" != self.tc.td.get("VIRTUAL-RUNTIME_init_manager", ""):
41 (_, _) = self.target.run('/etc/init.d/syslog restart') 41 (_, _) = self.target.run('/etc/init.d/syslog restart')
@@ -44,7 +44,7 @@ class SyslogTestConfig(OERuntimeTestCase):
44 44
45 45
46 @OETestID(202) 46 @OETestID(202)
47 @OETestDepends(['syslog.SyslogTestConfig.test_syslog_logger']) 47 @OETestDepends(['oe_syslog.SyslogTestConfig.test_syslog_logger'])
48 @OEHasPackage(["!sysklogd", "busybox"]) 48 @OEHasPackage(["!sysklogd", "busybox"])
49 @skipIfDataVar('VIRTUAL-RUNTIME_init_manager', 'systemd', 49 @skipIfDataVar('VIRTUAL-RUNTIME_init_manager', 'systemd',
50 'Not appropiate for systemd image') 50 'Not appropiate for systemd image')