mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
oeqa/core/threaded: Remove in favour of using concurrenttests
We have several options for parallel processing in oeqa, parallel execution of modules, threading and mulitple processes for the runners. After much experimentation is appears the most scalable and least invasive approach is multiple processes using concurrenttestsuite from testtools. This means we can drop the current threading code which is only used by the sdk test execution. oeqa/decorator/depends: Remove threading code Revert "oeqa/sdk: Enable usage of OEQA thread mode" This reverts commitadc434c063. Revert "oeqa/core/tests: Add tests of OEQA Threaded mode" This reverts commita4eef558c9. Revert "oeqa/core/decorator/oetimeout: Add support for OEQA threaded mode" This reverts commitd3d4ba902d. (From OE-Core rev: a98ab5e560e73b6988512fbae5cefe9e42ceed53) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
# Copyright (C) 2017 Intel Corporation
|
||||
# Released under the MIT license (see COPYING.MIT)
|
||||
|
||||
from oeqa.core.case import OETestCase
|
||||
|
||||
class ThreadedTest(OETestCase):
|
||||
def test_threaded_no_depends(self):
|
||||
self.assertTrue(True, msg='How is this possible?')
|
||||
|
||||
class ThreadedTest2(OETestCase):
|
||||
def test_threaded_same_module(self):
|
||||
self.assertTrue(True, msg='How is this possible?')
|
||||
@@ -1,8 +0,0 @@
|
||||
# Copyright (C) 2017 Intel Corporation
|
||||
# Released under the MIT license (see COPYING.MIT)
|
||||
|
||||
from oeqa.core.case import OETestCase
|
||||
|
||||
class ThreadedTestAlone(OETestCase):
|
||||
def test_threaded_alone(self):
|
||||
self.assertTrue(True, msg='How is this possible?')
|
||||
@@ -1,10 +0,0 @@
|
||||
# Copyright (C) 2017 Intel Corporation
|
||||
# Released under the MIT license (see COPYING.MIT)
|
||||
|
||||
from oeqa.core.case import OETestCase
|
||||
from oeqa.core.decorator.depends import OETestDepends
|
||||
|
||||
class ThreadedTest3(OETestCase):
|
||||
@OETestDepends(['threaded.ThreadedTest.test_threaded_no_depends'])
|
||||
def test_threaded_depends(self):
|
||||
self.assertTrue(True, msg='How is this possible?')
|
||||
@@ -1,12 +0,0 @@
|
||||
# Copyright (C) 2017 Intel Corporation
|
||||
# Released under the MIT license (see COPYING.MIT)
|
||||
|
||||
from oeqa.core.case import OETestCase
|
||||
|
||||
class ThreadedTestModule(OETestCase):
|
||||
def test_threaded_module(self):
|
||||
self.assertTrue(True, msg='How is this possible?')
|
||||
|
||||
class ThreadedTestModule2(OETestCase):
|
||||
def test_threaded_module2(self):
|
||||
self.assertTrue(True, msg='How is this possible?')
|
||||
@@ -33,13 +33,3 @@ class TestBase(unittest.TestCase):
|
||||
tc.loadTests(self.cases_path, modules=modules, tests=tests,
|
||||
filters=filters)
|
||||
return tc
|
||||
|
||||
def _testLoaderThreaded(self, d={}, modules=[],
|
||||
tests=[], filters={}):
|
||||
from oeqa.core.threaded import OETestContextThreaded
|
||||
|
||||
tc = OETestContextThreaded(d, self.logger)
|
||||
tc.loadTests(self.cases_path, modules=modules, tests=tests,
|
||||
filters=filters)
|
||||
|
||||
return tc
|
||||
|
||||
@@ -131,17 +131,5 @@ class TestTimeoutDecorator(TestBase):
|
||||
msg = "OETestTimeout didn't restore SIGALRM"
|
||||
self.assertIs(alarm_signal, signal.getsignal(signal.SIGALRM), msg=msg)
|
||||
|
||||
def test_timeout_thread(self):
|
||||
tests = ['timeout.TimeoutTest.testTimeoutPass']
|
||||
msg = 'Failed to run test using OETestTimeout'
|
||||
tc = self._testLoaderThreaded(modules=self.modules, tests=tests)
|
||||
self.assertTrue(tc.runTests().wasSuccessful(), msg=msg)
|
||||
|
||||
def test_timeout_threaded_fail(self):
|
||||
tests = ['timeout.TimeoutTest.testTimeoutFail']
|
||||
msg = "OETestTimeout test didn't timeout as expected"
|
||||
tc = self._testLoaderThreaded(modules=self.modules, tests=tests)
|
||||
self.assertFalse(tc.runTests().wasSuccessful(), msg=msg)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright (C) 2016-2017 Intel Corporation
|
||||
# Copyright (C) 2016 Intel Corporation
|
||||
# Released under the MIT license (see COPYING.MIT)
|
||||
|
||||
import os
|
||||
@@ -82,33 +82,5 @@ class TestLoader(TestBase):
|
||||
msg = 'Expected modules from two different paths'
|
||||
self.assertEqual(modules, expected_modules, msg=msg)
|
||||
|
||||
def test_loader_threaded(self):
|
||||
cases_path = self.cases_path
|
||||
|
||||
self.cases_path = [os.path.join(self.cases_path, 'loader', 'threaded')]
|
||||
|
||||
tc = self._testLoaderThreaded()
|
||||
self.assertEqual(len(tc.suites), 3, "Expected to be 3 suites")
|
||||
|
||||
case_ids = ['threaded.ThreadedTest.test_threaded_no_depends',
|
||||
'threaded.ThreadedTest2.test_threaded_same_module',
|
||||
'threaded_depends.ThreadedTest3.test_threaded_depends']
|
||||
for case in tc.suites[0]._tests:
|
||||
self.assertEqual(case.id(),
|
||||
case_ids[tc.suites[0]._tests.index(case)])
|
||||
|
||||
case_ids = ['threaded_alone.ThreadedTestAlone.test_threaded_alone']
|
||||
for case in tc.suites[1]._tests:
|
||||
self.assertEqual(case.id(),
|
||||
case_ids[tc.suites[1]._tests.index(case)])
|
||||
|
||||
case_ids = ['threaded_module.ThreadedTestModule.test_threaded_module',
|
||||
'threaded_module.ThreadedTestModule2.test_threaded_module2']
|
||||
for case in tc.suites[2]._tests:
|
||||
self.assertEqual(case.id(),
|
||||
case_ids[tc.suites[2]._tests.index(case)])
|
||||
|
||||
self.cases_path = cases_path
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user