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 e69de29bb2..e69de29bb2 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 1f59037ed9..1f59037ed9 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 c388886184..c388886184 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 44d068143e..44d068143e 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 367cc30e45..4fe2746a3b 100644 --- a/meta/lib/oe/tests/test_types.py +++ b/meta/lib/oeqa/selftest/oelib/types.py | |||
@@ -1,19 +1,7 @@ | |||
1 | import unittest | 1 | import unittest |
2 | from oe.maketype import create, factory | 2 | from oe.maketype import create |
3 | 3 | ||
4 | class TestTypes(unittest.TestCase): | 4 | class TestBooleanType(unittest.TestCase): |
5 | def assertIsInstance(self, obj, cls): | ||
6 | return self.assertTrue(isinstance(obj, cls)) | ||
7 | |||
8 | def assertIsNot(self, obj, other): | ||
9 | return self.assertFalse(obj is other) | ||
10 | |||
11 | def assertFactoryCreated(self, value, type, **flags): | ||
12 | cls = factory(type) | ||
13 | self.assertIsNot(cls, None) | ||
14 | self.assertIsInstance(create(value, type, **flags), cls) | ||
15 | |||
16 | class TestBooleanType(TestTypes): | ||
17 | def test_invalid(self): | 5 | def test_invalid(self): |
18 | self.assertRaises(ValueError, create, '', 'boolean') | 6 | self.assertRaises(ValueError, create, '', 'boolean') |
19 | self.assertRaises(ValueError, create, 'foo', 'boolean') | 7 | self.assertRaises(ValueError, create, 'foo', 'boolean') |
@@ -43,7 +31,7 @@ class TestBooleanType(TestTypes): | |||
43 | self.assertEqual(create('y', 'boolean'), True) | 31 | self.assertEqual(create('y', 'boolean'), True) |
44 | self.assertNotEqual(create('y', 'boolean'), False) | 32 | self.assertNotEqual(create('y', 'boolean'), False) |
45 | 33 | ||
46 | class TestList(TestTypes): | 34 | class TestList(unittest.TestCase): |
47 | def assertListEqual(self, value, valid, sep=None): | 35 | def assertListEqual(self, value, valid, sep=None): |
48 | obj = create(value, 'list', separator=sep) | 36 | obj = create(value, 'list', separator=sep) |
49 | self.assertEqual(obj, valid) | 37 | self.assertEqual(obj, valid) |
diff --git a/meta/lib/oe/tests/test_utils.py b/meta/lib/oeqa/selftest/oelib/utils.py index 5d9ac52e7d..7deb10f3c8 100644 --- a/meta/lib/oe/tests/test_utils.py +++ b/meta/lib/oeqa/selftest/oelib/utils.py | |||
@@ -1,5 +1,5 @@ | |||
1 | import unittest | 1 | import unittest |
2 | from oe.utils import packages_filter_out_system | 2 | from oe.utils import packages_filter_out_system, trim_version |
3 | 3 | ||
4 | class TestPackagesFilterOutSystem(unittest.TestCase): | 4 | class TestPackagesFilterOutSystem(unittest.TestCase): |
5 | def test_filter(self): | 5 | def test_filter(self): |