diff options
-rw-r--r-- | meta/lib/oeqa/selftest/oelib/__init__.py (renamed from meta/lib/oe/tests/__init__.py) | 0 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/oelib/elf.py (renamed from meta/lib/oe/tests/test_elf.py) | 0 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/oelib/license.py (renamed from meta/lib/oe/tests/test_license.py) | 0 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/oelib/path.py (renamed from meta/lib/oe/tests/test_path.py) | 0 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/oelib/types.py (renamed from meta/lib/oe/tests/test_types.py) | 18 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/oelib/utils.py (renamed from meta/lib/oe/tests/test_utils.py) | 2 |
6 files changed, 4 insertions, 16 deletions
diff --git a/meta/lib/oe/tests/__init__.py b/meta/lib/oeqa/selftest/oelib/__init__.py index e69de29bb2d..e69de29bb2d 100644 --- a/meta/lib/oe/tests/__init__.py +++ b/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 index 1f59037ed9f..1f59037ed9f 100644 --- a/meta/lib/oe/tests/test_elf.py +++ b/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 index c388886184a..c388886184a 100644 --- a/meta/lib/oe/tests/test_license.py +++ b/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 index 44d068143e3..44d068143e3 100644 --- a/meta/lib/oe/tests/test_path.py +++ b/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 index 367cc30e454..4fe2746a3bf 100644 --- 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 index 5d9ac52e7df..7deb10f3c8b 100644 --- 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): |