oeqa: move lib/oe tests to oe-selftest

These tests don't get ran often (as demonstrated by the fact that some were not
ported to Python 3), so move them to oeqa/selftest so they get executed
frequently and can be extended easily.

[ YOCTO #7376 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/lib/oe/tests/__init__.py b/meta/lib/oeqa/selftest/oelib/__init__.py
similarity index 100%
rename from meta/lib/oe/tests/__init__.py
rename to meta/lib/oeqa/selftest/oelib/__init__.py

diff --git a/meta/lib/oe/tests/test_elf.py b/meta/lib/oeqa/selftest/oelib/elf.py
similarity index 100%
rename from meta/lib/oe/tests/test_elf.py
rename to meta/lib/oeqa/selftest/oelib/elf.py

diff --git a/meta/lib/oe/tests/test_license.py b/meta/lib/oeqa/selftest/oelib/license.py
similarity index 100%
rename from meta/lib/oe/tests/test_license.py
rename to meta/lib/oeqa/selftest/oelib/license.py

diff --git a/meta/lib/oe/tests/test_path.py b/meta/lib/oeqa/selftest/oelib/path.py
similarity index 100%
rename from meta/lib/oe/tests/test_path.py
rename to meta/lib/oeqa/selftest/oelib/path.py

diff --git a/meta/lib/oe/tests/test_types.py b/meta/lib/oeqa/selftest/oelib/types.py
similarity index 79%
rename from meta/lib/oe/tests/test_types.py
rename to meta/lib/oeqa/selftest/oelib/types.py
index 367cc30e454f23934fa97b4ba84870f323d65be5..4fe2746a3bf7fa1b6bc7af2b519dc872c60b0871 100644 (file)
--- a/meta/lib/oe/tests/test_types.py
+++ b/meta/lib/oeqa/selftest/oelib/types.py
@@ -1,19 +1,7 @@
 import unittest
-from oe.maketype import create, factory
+from oe.maketype import create
 
-class TestTypes(unittest.TestCase):
-    def assertIsInstance(self, obj, cls):
-        return self.assertTrue(isinstance(obj, cls))
-
-    def assertIsNot(self, obj, other):
-        return self.assertFalse(obj is other)
-
-    def assertFactoryCreated(self, value, type, **flags):
-        cls = factory(type)
-        self.assertIsNot(cls, None)
-        self.assertIsInstance(create(value, type, **flags), cls)
-
-class TestBooleanType(TestTypes):
+class TestBooleanType(unittest.TestCase):
     def test_invalid(self):
         self.assertRaises(ValueError, create, '', 'boolean')
         self.assertRaises(ValueError, create, 'foo', 'boolean')
@@ -43,7 +31,7 @@ class TestBooleanType(TestTypes):
         self.assertEqual(create('y', 'boolean'), True)
         self.assertNotEqual(create('y', 'boolean'), False)
 
-class TestList(TestTypes):
+class TestList(unittest.TestCase):
     def assertListEqual(self, value, valid, sep=None):
         obj = create(value, 'list', separator=sep)
         self.assertEqual(obj, valid)

diff --git a/meta/lib/oe/tests/test_utils.py b/meta/lib/oeqa/selftest/oelib/utils.py
similarity index 96%
rename from meta/lib/oe/tests/test_utils.py
rename to meta/lib/oeqa/selftest/oelib/utils.py
index 5d9ac52e7df4c78de3406f82ab2c4d188810ac4b..7deb10f3c8bda35f89ed510576e90509705dd886 100644 (file)
--- a/meta/lib/oe/tests/test_utils.py
+++ b/meta/lib/oeqa/selftest/oelib/utils.py
@@ -1,5 +1,5 @@
 import unittest
-from oe.utils import packages_filter_out_system
+from oe.utils import packages_filter_out_system, trim_version
 
 class TestPackagesFilterOutSystem(unittest.TestCase):
     def test_filter(self):