diff options
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oelib/elf.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oelib/license.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oelib/path.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oelib/types.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/oelib/utils.py | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/meta/lib/oeqa/selftest/cases/oelib/elf.py b/meta/lib/oeqa/selftest/cases/oelib/elf.py index 0451ebaffb..74ee6a11cc 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/elf.py +++ b/meta/lib/oeqa/selftest/cases/oelib/elf.py | |||
@@ -1,7 +1,7 @@ | |||
1 | from oeqa.selftest.case import OESelftestTestCase | 1 | from unittest.case import TestCase |
2 | import oe.qa | 2 | import oe.qa |
3 | 3 | ||
4 | class TestElf(OESelftestTestCase): | 4 | class TestElf(TestCase): |
5 | def test_machine_name(self): | 5 | def test_machine_name(self): |
6 | """ | 6 | """ |
7 | Test elf_machine_to_string() | 7 | Test elf_machine_to_string() |
diff --git a/meta/lib/oeqa/selftest/cases/oelib/license.py b/meta/lib/oeqa/selftest/cases/oelib/license.py index a6d9c9ac7a..bfd9ed9c29 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/license.py +++ b/meta/lib/oeqa/selftest/cases/oelib/license.py | |||
@@ -1,4 +1,4 @@ | |||
1 | from oeqa.selftest.case import OESelftestTestCase | 1 | from unittest.case import TestCase |
2 | import oe.license | 2 | import oe.license |
3 | 3 | ||
4 | class SeenVisitor(oe.license.LicenseVisitor): | 4 | class SeenVisitor(oe.license.LicenseVisitor): |
@@ -9,7 +9,7 @@ class SeenVisitor(oe.license.LicenseVisitor): | |||
9 | def visit_Str(self, node): | 9 | def visit_Str(self, node): |
10 | self.seen.append(node.s) | 10 | self.seen.append(node.s) |
11 | 11 | ||
12 | class TestSingleLicense(OESelftestTestCase): | 12 | class TestSingleLicense(TestCase): |
13 | licenses = [ | 13 | licenses = [ |
14 | "GPLv2", | 14 | "GPLv2", |
15 | "LGPL-2.0", | 15 | "LGPL-2.0", |
@@ -37,7 +37,7 @@ class TestSingleLicense(OESelftestTestCase): | |||
37 | self.parse(license) | 37 | self.parse(license) |
38 | self.assertEqual(cm.exception.license, license) | 38 | self.assertEqual(cm.exception.license, license) |
39 | 39 | ||
40 | class TestSimpleCombinations(OESelftestTestCase): | 40 | class TestSimpleCombinations(TestCase): |
41 | tests = { | 41 | tests = { |
42 | "FOO&BAR": ["FOO", "BAR"], | 42 | "FOO&BAR": ["FOO", "BAR"], |
43 | "BAZ & MOO": ["BAZ", "MOO"], | 43 | "BAZ & MOO": ["BAZ", "MOO"], |
diff --git a/meta/lib/oeqa/selftest/cases/oelib/path.py b/meta/lib/oeqa/selftest/cases/oelib/path.py index 2ae5eaf89e..75a27c06f7 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/path.py +++ b/meta/lib/oeqa/selftest/cases/oelib/path.py | |||
@@ -1,11 +1,11 @@ | |||
1 | from oeqa.selftest.case import OESelftestTestCase | 1 | from unittest.case import TestCase |
2 | import oe, oe.path | 2 | import oe, oe.path |
3 | import tempfile | 3 | import tempfile |
4 | import os | 4 | import os |
5 | import errno | 5 | import errno |
6 | import shutil | 6 | import shutil |
7 | 7 | ||
8 | class TestRealPath(OESelftestTestCase): | 8 | class TestRealPath(TestCase): |
9 | DIRS = [ "a", "b", "etc", "sbin", "usr", "usr/bin", "usr/binX", "usr/sbin", "usr/include", "usr/include/gdbm" ] | 9 | DIRS = [ "a", "b", "etc", "sbin", "usr", "usr/bin", "usr/binX", "usr/sbin", "usr/include", "usr/include/gdbm" ] |
10 | FILES = [ "etc/passwd", "b/file" ] | 10 | FILES = [ "etc/passwd", "b/file" ] |
11 | LINKS = [ | 11 | LINKS = [ |
diff --git a/meta/lib/oeqa/selftest/cases/oelib/types.py b/meta/lib/oeqa/selftest/cases/oelib/types.py index 99c84044be..6b53aa64e5 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/types.py +++ b/meta/lib/oeqa/selftest/cases/oelib/types.py | |||
@@ -1,7 +1,7 @@ | |||
1 | from oeqa.selftest.case import OESelftestTestCase | 1 | from unittest.case import TestCase |
2 | from oe.maketype import create | 2 | from oe.maketype import create |
3 | 3 | ||
4 | class TestBooleanType(OESelftestTestCase): | 4 | class TestBooleanType(TestCase): |
5 | def test_invalid(self): | 5 | def test_invalid(self): |
6 | self.assertRaises(ValueError, create, '', 'boolean') | 6 | self.assertRaises(ValueError, create, '', 'boolean') |
7 | self.assertRaises(ValueError, create, 'foo', 'boolean') | 7 | self.assertRaises(ValueError, create, 'foo', 'boolean') |
@@ -31,7 +31,7 @@ class TestBooleanType(OESelftestTestCase): | |||
31 | self.assertEqual(create('y', 'boolean'), True) | 31 | self.assertEqual(create('y', 'boolean'), True) |
32 | self.assertNotEqual(create('y', 'boolean'), False) | 32 | self.assertNotEqual(create('y', 'boolean'), False) |
33 | 33 | ||
34 | class TestList(OESelftestTestCase): | 34 | class TestList(TestCase): |
35 | def assertListEqual(self, value, valid, sep=None): | 35 | def assertListEqual(self, value, valid, sep=None): |
36 | obj = create(value, 'list', separator=sep) | 36 | obj = create(value, 'list', separator=sep) |
37 | self.assertEqual(obj, valid) | 37 | self.assertEqual(obj, valid) |
diff --git a/meta/lib/oeqa/selftest/cases/oelib/utils.py b/meta/lib/oeqa/selftest/cases/oelib/utils.py index 5bc5fffae7..9fb6c1576e 100644 --- a/meta/lib/oeqa/selftest/cases/oelib/utils.py +++ b/meta/lib/oeqa/selftest/cases/oelib/utils.py | |||
@@ -1,7 +1,7 @@ | |||
1 | from oeqa.selftest.case import OESelftestTestCase | 1 | from unittest.case import TestCase |
2 | from oe.utils import packages_filter_out_system, trim_version | 2 | from oe.utils import packages_filter_out_system, trim_version |
3 | 3 | ||
4 | class TestPackagesFilterOutSystem(OESelftestTestCase): | 4 | class TestPackagesFilterOutSystem(TestCase): |
5 | def test_filter(self): | 5 | def test_filter(self): |
6 | """ | 6 | """ |
7 | Test that oe.utils.packages_filter_out_system works. | 7 | Test that oe.utils.packages_filter_out_system works. |
@@ -31,7 +31,7 @@ class TestPackagesFilterOutSystem(OESelftestTestCase): | |||
31 | self.assertEqual(pkgs, ["foo-data"]) | 31 | self.assertEqual(pkgs, ["foo-data"]) |
32 | 32 | ||
33 | 33 | ||
34 | class TestTrimVersion(OESelftestTestCase): | 34 | class TestTrimVersion(TestCase): |
35 | def test_version_exception(self): | 35 | def test_version_exception(self): |
36 | with self.assertRaises(TypeError): | 36 | with self.assertRaises(TypeError): |
37 | trim_version(None, 2) | 37 | trim_version(None, 2) |