summaryrefslogtreecommitdiff
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-03-01 12:21:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 16:11:40 +0000
commit9f0f6326083ee76b72b431fbfcbe12c1ab2793b2 (patch)
treea62694235d5d5568484ad1292e809076b5089c76 /meta/lib/oeqa
parentc55401ba1646202fa36e4973b05dbacaa146cb16 (diff)
downloadopenembedded-core-9f0f6326083ee76b72b431fbfcbe12c1ab2793b2.tar.gz
openembedded-core-9f0f6326083ee76b72b431fbfcbe12c1ab2793b2.tar.bz2
openembedded-core-9f0f6326083ee76b72b431fbfcbe12c1ab2793b2.zip
oeqa/sdkext/devtool: use finally instead of repeating cleanup
Use the finally: block to always to cleanup. Now that the test harness in testsdk.bbclass has monkey-patched CalledProcessException to display the output we don't need to do that in the test case. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/sdkext/cases/devtool.py35
1 files changed, 10 insertions, 25 deletions
diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py
index ffaa2f00a5..63431aaa95 100644
--- a/meta/lib/oeqa/sdkext/cases/devtool.py
+++ b/meta/lib/oeqa/sdkext/cases/devtool.py
@@ -29,38 +29,32 @@ class DevtoolTest(OESDKExtTestCase):
self._run('devtool add myapp %s' % directory)
try:
self._run('devtool build myapp')
- except Exception as e:
- print(e.output)
+ finally:
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)
+ finally:
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.sdk_dir), True, \
msg="Seems that devtool isn't the eSDK one: %s" % output)
-
+
@OETestDepends(['test_devtool_location'])
def test_devtool_add_reset(self):
self._run('devtool add myapp %s' % self.myapp_dst)
self._run('devtool reset myapp')
-
+
@OETestID(1605)
@OETestDepends(['test_devtool_location'])
@skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_devtool_build_make(self):
self._test_devtool_build(self.myapp_dst)
-
+
@OETestID(1606)
@OETestDepends(['test_devtool_location'])
@skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
@@ -72,7 +66,7 @@ class DevtoolTest(OESDKExtTestCase):
@skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_devtool_build_cmake(self):
self._test_devtool_build(self.myapp_cmake_dst)
-
+
@OETestID(1608)
@OETestDepends(['test_devtool_location'])
@skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
@@ -82,11 +76,8 @@ class DevtoolTest(OESDKExtTestCase):
self._run('devtool add %s %s' % (recipe, req) )
try:
self._run('devtool build %s' % recipe)
- except Exception as e:
- print(e.output)
+ finally:
self._run('devtool reset %s' % recipe)
- raise e
- self._run('devtool reset %s' % recipe)
@OETestID(1609)
@OETestDepends(['test_devtool_location'])
@@ -97,11 +88,8 @@ class DevtoolTest(OESDKExtTestCase):
self._run('devtool add %s %s' % (recipe, docfile) )
try:
self._run('devtool build %s' % recipe)
- except Exception as e:
- print(e.output)
+ finally:
self._run('devtool reset %s' % recipe)
- raise e
- self._run('devtool reset %s' % recipe)
@OETestID(1610)
@OETestDepends(['test_devtool_location'])
@@ -111,8 +99,5 @@ class DevtoolTest(OESDKExtTestCase):
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)
+ finally:
+ self._run('devtool reset %s '% package_nodejs)