6 files changed, 27 insertions, 24 deletions
diff --git a/meta/lib/oe/tests/__init__.py b/meta/lib/oeqa/selftest/oe_tests/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/meta/lib/oe/tests/__init__.py
+++ b/meta/lib/oeqa/selftest/oe_tests/__init__.py
diff --git a/meta/lib/oe/tests/test_elf.py b/meta/lib/oeqa/selftest/oe_tests/elf.py
index 1f59037ed9f..582d7723c20 100644
--- a/meta/lib/oe/tests/test_elf.py
+++ b/meta/lib/oeqa/selftest/oe_tests/elf.py
@@ -1,7 +1,8 @@
-import unittest
+from oeqa.selftest.base import oeSelfTest
+from oeqa.utils.decorators import testcase
 import oe.qa
 
-class TestElf(unittest.TestCase):
+class TestElf(oeSelfTest):
     def test_machine_name(self):
         """
         Test elf_machine_to_string()
diff --git a/meta/lib/oe/tests/test_license.py b/meta/lib/oeqa/selftest/oe_tests/license.py
index c388886184a..90bdf516224 100644
--- a/meta/lib/oe/tests/test_license.py
+++ b/meta/lib/oeqa/selftest/oe_tests/license.py
@@ -1,5 +1,6 @@
-import unittest
 import oe.license
+from oeqa.selftest.base import oeSelfTest
+from oeqa.utils.decorators import testcase
 
 class SeenVisitor(oe.license.LicenseVisitor):
     def __init__(self):
@@ -9,7 +10,7 @@ class SeenVisitor(oe.license.LicenseVisitor):
     def visit_Str(self, node):
         self.seen.append(node.s)
 
-class TestSingleLicense(unittest.TestCase):
+class TestSingleLicense(oeSelfTest):
     licenses = [
         "GPLv2",
         "LGPL-2.0",
@@ -37,7 +38,7 @@ class TestSingleLicense(unittest.TestCase):
                 self.parse(license)
             self.assertEqual(cm.exception.license, license)
 
-class TestSimpleCombinations(unittest.TestCase):
+class TestSimpleCombinations(oeSelfTest):
     tests = {
         "FOO&BAR": ["FOO", "BAR"],
         "BAZ & MOO": ["BAZ", "MOO"],
diff --git a/meta/lib/oe/tests/test_path.py b/meta/lib/oeqa/selftest/oe_tests/path.py
index 44d068143e3..09b56cbf9a2 100644
--- a/meta/lib/oe/tests/test_path.py
+++ b/meta/lib/oeqa/selftest/oe_tests/path.py
@@ -1,11 +1,12 @@
-import unittest
+from oeqa.selftest.base import oeSelfTest
+from oeqa.utils.decorators import testcase
 import oe, oe.path
 import tempfile
 import os
 import errno
 import shutil
 
-class TestRealPath(unittest.TestCase):
+class TestRealPath(oeSelfTest):
     DIRS = [ "a", "b", "etc", "sbin", "usr", "usr/bin", "usr/binX", "usr/sbin", "usr/include", "usr/include/gdbm" ]
     FILES = [ "etc/passwd", "b/file" ]
     LINKS = [
diff --git a/meta/lib/oe/tests/test_types.py b/meta/lib/oeqa/selftest/oe_tests/types.py
index 367cc30e454..2613da9fc8c 100644
--- a/meta/lib/oe/tests/test_types.py
+++ b/meta/lib/oeqa/selftest/oe_tests/types.py
@@ -1,7 +1,8 @@
-import unittest
+from oeqa.selftest.base import oeSelfTest
+from oeqa.utils.decorators import testcase
 from oe.maketype import create, factory
 
-class TestTypes(unittest.TestCase):
+class TestTypes(oeSelfTest):
     def assertIsInstance(self, obj, cls):
         return self.assertTrue(isinstance(obj, cls))
 
@@ -13,6 +14,10 @@ class TestTypes(unittest.TestCase):
         self.assertIsNot(cls, None)
         self.assertIsInstance(create(value, type, **flags), cls)
 
+    def assertListIsEqual(self, value, valid, sep=None):
+        obj = create(value, 'list', separator=sep)
+        self.assertListEqual(obj, valid)
+
 class TestBooleanType(TestTypes):
     def test_invalid(self):
         self.assertRaises(ValueError, create, '', 'boolean')
@@ -44,19 +49,13 @@ class TestBooleanType(TestTypes):
         self.assertNotEqual(create('y', 'boolean'), False)
 
 class TestList(TestTypes):
-    def assertListEqual(self, value, valid, sep=None):
-        obj = create(value, 'list', separator=sep)
-        self.assertEqual(obj, valid)
-        if sep is not None:
-            self.assertEqual(obj.separator, sep)
-        self.assertEqual(str(obj), obj.separator.join(obj))
 
     def test_list_nosep(self):
         testlist = ['alpha', 'beta', 'theta']
-        self.assertListEqual('alpha beta theta', testlist)
-        self.assertListEqual('alpha  beta\ttheta', testlist)
-        self.assertListEqual('alpha', ['alpha'])
+        self.assertListIsEqual('alpha beta theta', testlist)
+        self.assertListIsEqual('alpha  beta\ttheta', testlist)
+        self.assertListIsEqual('alpha', ['alpha'])
 
     def test_list_usersep(self):
-        self.assertListEqual('foo:bar', ['foo', 'bar'], ':')
-        self.assertListEqual('foo:bar:baz', ['foo', 'bar', 'baz'], ':')
+        self.assertListIsEqual('foo:bar', ['foo', 'bar'], ':')
+        self.assertListIsEqual('foo:bar:baz', ['foo', 'bar', 'baz'], ':')
diff --git a/meta/lib/oe/tests/test_utils.py b/meta/lib/oeqa/selftest/oe_tests/utils.py
index 5d9ac52e7df..25c60e14c7e 100644
--- a/meta/lib/oe/tests/test_utils.py
+++ b/meta/lib/oeqa/selftest/oe_tests/utils.py
@@ -1,7 +1,8 @@
-import unittest
-from oe.utils import packages_filter_out_system
+from oeqa.selftest.base import oeSelfTest
+from oeqa.utils.decorators import testcase
+from oe.utils import packages_filter_out_system, trim_version
 
-class TestPackagesFilterOutSystem(unittest.TestCase):
+class TestPackagesFilterOutSystem(oeSelfTest):
     def test_filter(self):
         """
         Test that oe.utils.packages_filter_out_system works.
@@ -31,7 +32,7 @@ class TestPackagesFilterOutSystem(unittest.TestCase):
         self.assertEqual(pkgs, ["foo-data"])
 
 
-class TestTrimVersion(unittest.TestCase):
+class TestTrimVersion(oeSelfTest):
     def test_version_exception(self):
         with self.assertRaises(TypeError):
             trim_version(None, 2)