summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/core/tests/test_loader.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/core/tests/test_loader.py')
-rwxr-xr-xmeta/lib/oeqa/core/tests/test_loader.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/lib/oeqa/core/tests/test_loader.py b/meta/lib/oeqa/core/tests/test_loader.py
index b79b8bad4d..39f2d6e2a7 100755
--- a/meta/lib/oeqa/core/tests/test_loader.py
+++ b/meta/lib/oeqa/core/tests/test_loader.py
@@ -42,7 +42,7 @@ class TestLoader(TestBase):
42 cases_path = self.cases_path 42 cases_path = self.cases_path
43 invalid_path = os.path.join(cases_path, 'loader', 'invalid') 43 invalid_path = os.path.join(cases_path, 'loader', 'invalid')
44 self.cases_path = [self.cases_path, invalid_path] 44 self.cases_path = [self.cases_path, invalid_path]
45 expect = 'Duplicated oeid module found in' 45 expect = 'Duplicated oetag module found in'
46 msg = 'Expected ImportError exception for having duplicated module' 46 msg = 'Expected ImportError exception for having duplicated module'
47 try: 47 try:
48 # Must throw ImportEror because duplicated module 48 # Must throw ImportEror because duplicated module
@@ -55,17 +55,16 @@ class TestLoader(TestBase):
55 self.cases_path = cases_path 55 self.cases_path = cases_path
56 56
57 def test_filter_modules(self): 57 def test_filter_modules(self):
58 expected_modules = {'oeid', 'oetag'} 58 expected_modules = {'oetag'}
59 tc = self._testLoader(modules=expected_modules) 59 tc = self._testLoader(modules=expected_modules)
60 modules = getSuiteModules(tc.suites) 60 modules = getSuiteModules(tc.suites)
61 msg = 'Expected just %s modules' % ', '.join(expected_modules) 61 msg = 'Expected just %s modules' % ', '.join(expected_modules)
62 self.assertEqual(modules, expected_modules, msg=msg) 62 self.assertEqual(modules, expected_modules, msg=msg)
63 63
64 def test_filter_cases(self): 64 def test_filter_cases(self):
65 modules = ['oeid', 'oetag', 'data'] 65 modules = ['oetag', 'data']
66 expected_cases = {'data.DataTest.testDataOk', 66 expected_cases = {'data.DataTest.testDataOk',
67 'oetag.TagTest.testTagGood', 67 'oetag.TagTest.testTagGood'}
68 'oeid.IDTest.testIdGood'}
69 tc = self._testLoader(modules=modules, tests=expected_cases) 68 tc = self._testLoader(modules=modules, tests=expected_cases)
70 cases = set(getSuiteCasesIDs(tc.suites)) 69 cases = set(getSuiteCasesIDs(tc.suites))
71 msg = 'Expected just %s cases' % ', '.join(expected_cases) 70 msg = 'Expected just %s cases' % ', '.join(expected_cases)
@@ -74,7 +73,7 @@ class TestLoader(TestBase):
74 def test_import_from_paths(self): 73 def test_import_from_paths(self):
75 cases_path = self.cases_path 74 cases_path = self.cases_path
76 cases2_path = os.path.join(cases_path, 'loader', 'valid') 75 cases2_path = os.path.join(cases_path, 'loader', 'valid')
77 expected_modules = {'oeid', 'another'} 76 expected_modules = {'another'}
78 self.cases_path = [self.cases_path, cases2_path] 77 self.cases_path = [self.cases_path, cases2_path]
79 tc = self._testLoader(modules=expected_modules) 78 tc = self._testLoader(modules=expected_modules)
80 modules = getSuiteModules(tc.suites) 79 modules = getSuiteModules(tc.suites)