[OE-core] [PATCHv2 1/5] runtime/cases: Fix case numbers, missing cases and unused classes
mariano.lopez at linux.intel.com
mariano.lopez at linux.intel.com
Fri Jan 27 12:10:38 UTC 2017
From: Mariano Lopez <mariano.lopez at linux.intel.com>
connman: oeRuntimeTest class is not used anymore as part of runtime
migration, this particular case was missed, so fix it.
gcc: Removed unneded lines.
multilib: fixed case number.
syslog: added a missing test.
[YOCTO #10964]
Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
---
meta/lib/oeqa/runtime/cases/connman.py | 2 +-
meta/lib/oeqa/runtime/cases/gcc.py | 3 ---
meta/lib/oeqa/runtime/cases/multilib.py | 2 +-
meta/lib/oeqa/runtime/cases/syslog.py | 9 +++++++++
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/connman.py b/meta/lib/oeqa/runtime/cases/connman.py
index 8b47108..12456b4 100644
--- a/meta/lib/oeqa/runtime/cases/connman.py
+++ b/meta/lib/oeqa/runtime/cases/connman.py
@@ -6,7 +6,7 @@ from oeqa.runtime.decorator.package import OEHasPackage
class ConnmanTest(OERuntimeTestCase):
def service_status(self, service):
- if oeRuntimeTest.hasFeature("systemd"):
+ if 'systemd' in self.tc.td['DISTRO_FEATURES']:
(_, output) = self.target.run('systemctl status -l %s' % service)
return output
else:
diff --git a/meta/lib/oeqa/runtime/cases/gcc.py b/meta/lib/oeqa/runtime/cases/gcc.py
index 064fa49..9110831 100644
--- a/meta/lib/oeqa/runtime/cases/gcc.py
+++ b/meta/lib/oeqa/runtime/cases/gcc.py
@@ -11,15 +11,12 @@ class GccCompileTest(OERuntimeTestCase):
def setUpClass(cls):
dst = '/tmp/'
src = os.path.join(cls.tc.files_dir, 'test.c')
- #dst = '/tmp/test.c'
cls.tc.target.copyTo(src, dst)
src = os.path.join(cls.tc.runtime_files_dir, 'testmakefile')
- #dst = '/tmp/testmakefile'
cls.tc.target.copyTo(src, dst)
src = os.path.join(cls.tc.files_dir, 'test.cpp')
- #dst = '/tmp/test.cpp'
cls.tc.target.copyTo(src, dst)
@classmethod
diff --git a/meta/lib/oeqa/runtime/cases/multilib.py b/meta/lib/oeqa/runtime/cases/multilib.py
index 8f6d2b2..8c167f1 100644
--- a/meta/lib/oeqa/runtime/cases/multilib.py
+++ b/meta/lib/oeqa/runtime/cases/multilib.py
@@ -23,9 +23,9 @@ class MultilibTest(OERuntimeTestCase):
msg = "%s isn't %s (is %s)" % (binary, arch, theclass)
self.assertEqual(theclass, arch, msg=msg)
+ @OETestID(1593)
@skipIfNotInDataVar('MULTILIBS', 'multilib:lib32',
"This isn't a multilib:lib32 image")
- @OETestID(201)
@OETestDepends(['ssh.SSHTest.test_ssh'])
def test_check_multilib_libc(self):
"""
diff --git a/meta/lib/oeqa/runtime/cases/syslog.py b/meta/lib/oeqa/runtime/cases/syslog.py
index 1016e67..537c519 100644
--- a/meta/lib/oeqa/runtime/cases/syslog.py
+++ b/meta/lib/oeqa/runtime/cases/syslog.py
@@ -34,6 +34,15 @@ class SyslogTestConfig(OERuntimeTestCase):
' Output: %s ' % output)
self.assertEqual(status, 0, msg=msg)
+ @OETestID(1150)
+ @OETestDepends(['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')
+ else:
+ (_, _) = self.target.run('systemctl restart syslog.service')
+
+
@OETestID(202)
@OETestDepends(['syslog.SyslogTestConfig.test_syslog_logger'])
@OEHasPackage(["!sysklogd", "busybox"])
--
2.6.6
More information about the Openembedded-core
mailing list