From bdb92fa4d9bd2e4a0a14e3adc62a6b9e9bf639d3 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Wed, 30 Nov 2016 10:35:52 -0600 Subject: oeqa/sdkext: Move test cases inside cases directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For match with the new structure of the OEQA framework. In the new framework Test component base directory in this case sdk module will contain case and context implementations. [YOCTO #10599] Signed-off-by: Aníbal Limón --- meta/lib/oeqa/sdkext/__init__.py | 3 - meta/lib/oeqa/sdkext/cases/devtool.py | 108 +++++++++++++++++++++++++++++++ meta/lib/oeqa/sdkext/cases/sdk_update.py | 36 +++++++++++ meta/lib/oeqa/sdkext/devtool.py | 108 ------------------------------- meta/lib/oeqa/sdkext/sdk_update.py | 36 ----------- 5 files changed, 144 insertions(+), 147 deletions(-) create mode 100644 meta/lib/oeqa/sdkext/cases/devtool.py create mode 100644 meta/lib/oeqa/sdkext/cases/sdk_update.py delete mode 100644 meta/lib/oeqa/sdkext/devtool.py delete mode 100644 meta/lib/oeqa/sdkext/sdk_update.py (limited to 'meta') diff --git a/meta/lib/oeqa/sdkext/__init__.py b/meta/lib/oeqa/sdkext/__init__.py index 4cf3fa76b6..e69de29bb2 100644 --- a/meta/lib/oeqa/sdkext/__init__.py +++ b/meta/lib/oeqa/sdkext/__init__.py @@ -1,3 +0,0 @@ -# Enable other layers to have tests in the same named directory -from pkgutil import extend_path -__path__ = extend_path(__path__, __name__) diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py new file mode 100644 index 0000000000..65f41f6875 --- /dev/null +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -0,0 +1,108 @@ +import shutil +import subprocess +import urllib.request +from oeqa.oetest import oeSDKExtTest +from oeqa.utils.decorators import * + +class DevtoolTest(oeSDKExtTest): + @classmethod + def setUpClass(self): + self.myapp_src = os.path.join(self.tc.sdkextfilesdir, "myapp") + self.myapp_dst = os.path.join(self.tc.sdktestdir, "myapp") + shutil.copytree(self.myapp_src, self.myapp_dst) + + self.myapp_cmake_src = os.path.join(self.tc.sdkextfilesdir, "myapp_cmake") + self.myapp_cmake_dst = os.path.join(self.tc.sdktestdir, "myapp_cmake") + shutil.copytree(self.myapp_cmake_src, self.myapp_cmake_dst) + + def _test_devtool_build(self, directory): + self._run('devtool add myapp %s' % directory) + try: + self._run('devtool build myapp') + except Exception as e: + print(e.output) + self._run('devtool reset myapp') + raise e + self._run('devtool reset myapp') + + def _test_devtool_build_package(self, directory): + self._run('devtool add myapp %s' % directory) + try: + self._run('devtool package myapp') + except Exception as e: + print(e.output) + self._run('devtool reset myapp') + raise e + self._run('devtool reset myapp') + + def test_devtool_location(self): + output = self._run('which devtool') + self.assertEqual(output.startswith(self.tc.sdktestdir), True, \ + msg="Seems that devtool isn't the eSDK one: %s" % output) + + @skipUnlessPassed('test_devtool_location') + def test_devtool_add_reset(self): + self._run('devtool add myapp %s' % self.myapp_dst) + self._run('devtool reset myapp') + + @testcase(1473) + @skipUnlessPassed('test_devtool_location') + def test_devtool_build_make(self): + self._test_devtool_build(self.myapp_dst) + + @testcase(1474) + @skipUnlessPassed('test_devtool_location') + def test_devtool_build_esdk_package(self): + self._test_devtool_build_package(self.myapp_dst) + + @testcase(1479) + @skipUnlessPassed('test_devtool_location') + def test_devtool_build_cmake(self): + self._test_devtool_build(self.myapp_cmake_dst) + + @testcase(1482) + @skipUnlessPassed('test_devtool_location') + def test_extend_autotools_recipe_creation(self): + req = 'https://github.com/rdfa/librdfa' + recipe = "bbexample" + self._run('devtool add %s %s' % (recipe, req) ) + try: + self._run('devtool build %s' % recipe) + except Exception as e: + print(e.output) + self._run('devtool reset %s' % recipe) + raise e + self._run('devtool reset %s' % recipe) + + @testcase(1484) + @skipUnlessPassed('test_devtool_location') + def test_devtool_kernelmodule(self): + docfile = 'https://github.com/umlaeute/v4l2loopback.git' + recipe = 'v4l2loopback-driver' + self._run('devtool add %s %s' % (recipe, docfile) ) + try: + self._run('devtool build %s' % recipe) + except Exception as e: + print(e.output) + self._run('devtool reset %s' % recipe) + raise e + self._run('devtool reset %s' % recipe) + + @testcase(1478) + @skipUnlessPassed('test_devtool_location') + def test_recipes_for_nodejs(self): + package_nodejs = "npm://registry.npmjs.org;name=winston;version=2.2.0" + self._run('devtool add %s ' % package_nodejs) + try: + self._run('devtool build %s ' % package_nodejs) + except Exception as e: + print(e.output) + self._run('devtool reset %s' % package_nodejs) + raise e + self._run('devtool reset %s '% package_nodejs) + + + @classmethod + def tearDownClass(self): + shutil.rmtree(self.myapp_dst) + shutil.rmtree(self.myapp_cmake_dst) diff --git a/meta/lib/oeqa/sdkext/cases/sdk_update.py b/meta/lib/oeqa/sdkext/cases/sdk_update.py new file mode 100644 index 0000000000..2ade839c05 --- /dev/null +++ b/meta/lib/oeqa/sdkext/cases/sdk_update.py @@ -0,0 +1,36 @@ +import os +import shutil +import subprocess + +from oeqa.oetest import oeSDKExtTest +from oeqa.utils.httpserver import HTTPService + +class SdkUpdateTest(oeSDKExtTest): + + @classmethod + def setUpClass(self): + self.publish_dir = os.path.join(self.tc.sdktestdir, 'esdk_publish') + if os.path.exists(self.publish_dir): + shutil.rmtree(self.publish_dir) + os.mkdir(self.publish_dir) + + tcname_new = self.tc.d.expand( + "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}-new.sh") + if not os.path.exists(tcname_new): + tcname_new = self.tc.tcname + + cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir) + subprocess.check_output(cmd, shell=True) + + self.http_service = HTTPService(self.publish_dir) + self.http_service.start() + + self.http_url = "http://127.0.0.1:%d" % self.http_service.port + + def test_sdk_update_http(self): + output = self._run("devtool sdk-update \"%s\"" % self.http_url) + + @classmethod + def tearDownClass(self): + self.http_service.stop() + shutil.rmtree(self.publish_dir) diff --git a/meta/lib/oeqa/sdkext/devtool.py b/meta/lib/oeqa/sdkext/devtool.py deleted file mode 100644 index 65f41f6875..0000000000 --- a/meta/lib/oeqa/sdkext/devtool.py +++ /dev/null @@ -1,108 +0,0 @@ -import shutil -import subprocess -import urllib.request -from oeqa.oetest import oeSDKExtTest -from oeqa.utils.decorators import * - -class DevtoolTest(oeSDKExtTest): - @classmethod - def setUpClass(self): - self.myapp_src = os.path.join(self.tc.sdkextfilesdir, "myapp") - self.myapp_dst = os.path.join(self.tc.sdktestdir, "myapp") - shutil.copytree(self.myapp_src, self.myapp_dst) - - self.myapp_cmake_src = os.path.join(self.tc.sdkextfilesdir, "myapp_cmake") - self.myapp_cmake_dst = os.path.join(self.tc.sdktestdir, "myapp_cmake") - shutil.copytree(self.myapp_cmake_src, self.myapp_cmake_dst) - - def _test_devtool_build(self, directory): - self._run('devtool add myapp %s' % directory) - try: - self._run('devtool build myapp') - except Exception as e: - print(e.output) - self._run('devtool reset myapp') - raise e - self._run('devtool reset myapp') - - def _test_devtool_build_package(self, directory): - self._run('devtool add myapp %s' % directory) - try: - self._run('devtool package myapp') - except Exception as e: - print(e.output) - self._run('devtool reset myapp') - raise e - self._run('devtool reset myapp') - - def test_devtool_location(self): - output = self._run('which devtool') - self.assertEqual(output.startswith(self.tc.sdktestdir), True, \ - msg="Seems that devtool isn't the eSDK one: %s" % output) - - @skipUnlessPassed('test_devtool_location') - def test_devtool_add_reset(self): - self._run('devtool add myapp %s' % self.myapp_dst) - self._run('devtool reset myapp') - - @testcase(1473) - @skipUnlessPassed('test_devtool_location') - def test_devtool_build_make(self): - self._test_devtool_build(self.myapp_dst) - - @testcase(1474) - @skipUnlessPassed('test_devtool_location') - def test_devtool_build_esdk_package(self): - self._test_devtool_build_package(self.myapp_dst) - - @testcase(1479) - @skipUnlessPassed('test_devtool_location') - def test_devtool_build_cmake(self): - self._test_devtool_build(self.myapp_cmake_dst) - - @testcase(1482) - @skipUnlessPassed('test_devtool_location') - def test_extend_autotools_recipe_creation(self): - req = 'https://github.com/rdfa/librdfa' - recipe = "bbexample" - self._run('devtool add %s %s' % (recipe, req) ) - try: - self._run('devtool build %s' % recipe) - except Exception as e: - print(e.output) - self._run('devtool reset %s' % recipe) - raise e - self._run('devtool reset %s' % recipe) - - @testcase(1484) - @skipUnlessPassed('test_devtool_location') - def test_devtool_kernelmodule(self): - docfile = 'https://github.com/umlaeute/v4l2loopback.git' - recipe = 'v4l2loopback-driver' - self._run('devtool add %s %s' % (recipe, docfile) ) - try: - self._run('devtool build %s' % recipe) - except Exception as e: - print(e.output) - self._run('devtool reset %s' % recipe) - raise e - self._run('devtool reset %s' % recipe) - - @testcase(1478) - @skipUnlessPassed('test_devtool_location') - def test_recipes_for_nodejs(self): - package_nodejs = "npm://registry.npmjs.org;name=winston;version=2.2.0" - self._run('devtool add %s ' % package_nodejs) - try: - self._run('devtool build %s ' % package_nodejs) - except Exception as e: - print(e.output) - self._run('devtool reset %s' % package_nodejs) - raise e - self._run('devtool reset %s '% package_nodejs) - - - @classmethod - def tearDownClass(self): - shutil.rmtree(self.myapp_dst) - shutil.rmtree(self.myapp_cmake_dst) diff --git a/meta/lib/oeqa/sdkext/sdk_update.py b/meta/lib/oeqa/sdkext/sdk_update.py deleted file mode 100644 index 2ade839c05..0000000000 --- a/meta/lib/oeqa/sdkext/sdk_update.py +++ /dev/null @@ -1,36 +0,0 @@ -import os -import shutil -import subprocess - -from oeqa.oetest import oeSDKExtTest -from oeqa.utils.httpserver import HTTPService - -class SdkUpdateTest(oeSDKExtTest): - - @classmethod - def setUpClass(self): - self.publish_dir = os.path.join(self.tc.sdktestdir, 'esdk_publish') - if os.path.exists(self.publish_dir): - shutil.rmtree(self.publish_dir) - os.mkdir(self.publish_dir) - - tcname_new = self.tc.d.expand( - "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}-new.sh") - if not os.path.exists(tcname_new): - tcname_new = self.tc.tcname - - cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir) - subprocess.check_output(cmd, shell=True) - - self.http_service = HTTPService(self.publish_dir) - self.http_service.start() - - self.http_url = "http://127.0.0.1:%d" % self.http_service.port - - def test_sdk_update_http(self): - output = self._run("devtool sdk-update \"%s\"" % self.http_url) - - @classmethod - def tearDownClass(self): - self.http_service.stop() - shutil.rmtree(self.publish_dir) -- cgit 1.2.3-korg