diff options
author | Ross Burton <ross.burton@intel.com> | 2018-12-11 23:26:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-13 16:32:21 +0000 |
commit | 5e15b242a49ded354d23cff616365209d3f8588b (patch) | |
tree | c4da839539b2b99280a4b82e2ec300ba2f87dc80 | |
parent | 778f3ce1e66ebc517a36d8567b5debbf317be343 (diff) | |
download | poky-5e15b242a49ded354d23cff616365209d3f8588b.tar.gz |
oeqa/sdk: show output if run() fails
Use oeqa.utils.subprocesstweak to monkey-patch the subprocess exception so that
any output is shown, and remove any explicit try/catch handling that would have
hidden this.
(From OE-Core rev: 55964b33b561397287779ee474170790dfd03e85)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcpio.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildlzip.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/gcc.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/perl.py | 12 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/python.py | 21 | ||||
-rw-r--r-- | meta/lib/oeqa/sdkext/cases/devtool.py | 3 |
6 files changed, 26 insertions, 18 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index f348ac5d90..6697b12de2 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py | |||
@@ -2,6 +2,9 @@ import unittest | |||
2 | from oeqa.sdk.case import OESDKTestCase | 2 | from oeqa.sdk.case import OESDKTestCase |
3 | from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject | 3 | from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject |
4 | 4 | ||
5 | from oeqa.utils.subprocesstweak import errors_have_output | ||
6 | errors_have_output() | ||
7 | |||
5 | class BuildCpioTest(OESDKTestCase): | 8 | class BuildCpioTest(OESDKTestCase): |
6 | td_vars = ['DATETIME'] | 9 | td_vars = ['DATETIME'] |
7 | 10 | ||
diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py index 9d137f30eb..b57fbbece7 100644 --- a/meta/lib/oeqa/sdk/cases/buildlzip.py +++ b/meta/lib/oeqa/sdk/cases/buildlzip.py | |||
@@ -2,6 +2,8 @@ import unittest | |||
2 | from oeqa.sdk.case import OESDKTestCase | 2 | from oeqa.sdk.case import OESDKTestCase |
3 | from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject | 3 | from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject |
4 | 4 | ||
5 | from oeqa.utils.subprocesstweak import errors_have_output | ||
6 | errors_have_output() | ||
5 | 7 | ||
6 | class BuildLzipTest(OESDKTestCase): | 8 | class BuildLzipTest(OESDKTestCase): |
7 | td_vars = ['DATETIME'] | 9 | td_vars = ['DATETIME'] |
diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py index b32b01fc24..54c6fc488b 100644 --- a/meta/lib/oeqa/sdk/cases/gcc.py +++ b/meta/lib/oeqa/sdk/cases/gcc.py | |||
@@ -5,6 +5,9 @@ import unittest | |||
5 | from oeqa.core.utils.path import remove_safe | 5 | from oeqa.core.utils.path import remove_safe |
6 | from oeqa.sdk.case import OESDKTestCase | 6 | from oeqa.sdk.case import OESDKTestCase |
7 | 7 | ||
8 | from oeqa.utils.subprocesstweak import errors_have_output | ||
9 | errors_have_output() | ||
10 | |||
8 | class GccCompileTest(OESDKTestCase): | 11 | class GccCompileTest(OESDKTestCase): |
9 | td_vars = ['MACHINE'] | 12 | td_vars = ['MACHINE'] |
10 | 13 | ||
diff --git a/meta/lib/oeqa/sdk/cases/perl.py b/meta/lib/oeqa/sdk/cases/perl.py index e1d2bc159a..b8adc5ac72 100644 --- a/meta/lib/oeqa/sdk/cases/perl.py +++ b/meta/lib/oeqa/sdk/cases/perl.py | |||
@@ -1,6 +1,9 @@ | |||
1 | import unittest | 1 | import unittest |
2 | from oeqa.sdk.case import OESDKTestCase | 2 | from oeqa.sdk.case import OESDKTestCase |
3 | 3 | ||
4 | from oeqa.utils.subprocesstweak import errors_have_output | ||
5 | errors_have_output() | ||
6 | |||
4 | class PerlTest(OESDKTestCase): | 7 | class PerlTest(OESDKTestCase): |
5 | def setUp(self): | 8 | def setUp(self): |
6 | if not (self.tc.hasHostPackage("nativesdk-perl") or | 9 | if not (self.tc.hasHostPackage("nativesdk-perl") or |
@@ -8,9 +11,6 @@ class PerlTest(OESDKTestCase): | |||
8 | raise unittest.SkipTest("No perl package in the SDK") | 11 | raise unittest.SkipTest("No perl package in the SDK") |
9 | 12 | ||
10 | def test_perl(self): | 13 | def test_perl(self): |
11 | try: | 14 | cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'" |
12 | cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'" | 15 | output = self._run(cmd) |
13 | output = self._run(cmd) | 16 | self.assertEqual(output, "Hello, world") |
14 | self.assertEqual(output, "Hello, world") | ||
15 | except subprocess.CalledProcessError as e: | ||
16 | self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) | ||
diff --git a/meta/lib/oeqa/sdk/cases/python.py b/meta/lib/oeqa/sdk/cases/python.py index 2254867d45..b9174fadba 100644 --- a/meta/lib/oeqa/sdk/cases/python.py +++ b/meta/lib/oeqa/sdk/cases/python.py | |||
@@ -1,6 +1,9 @@ | |||
1 | import subprocess, unittest | 1 | import subprocess, unittest |
2 | from oeqa.sdk.case import OESDKTestCase | 2 | from oeqa.sdk.case import OESDKTestCase |
3 | 3 | ||
4 | from oeqa.utils.subprocesstweak import errors_have_output | ||
5 | errors_have_output() | ||
6 | |||
4 | class Python2Test(OESDKTestCase): | 7 | class Python2Test(OESDKTestCase): |
5 | def setUp(self): | 8 | def setUp(self): |
6 | if not (self.tc.hasHostPackage("nativesdk-python-core") or | 9 | if not (self.tc.hasHostPackage("nativesdk-python-core") or |
@@ -8,12 +11,9 @@ class Python2Test(OESDKTestCase): | |||
8 | raise unittest.SkipTest("No python package in the SDK") | 11 | raise unittest.SkipTest("No python package in the SDK") |
9 | 12 | ||
10 | def test_python2(self): | 13 | def test_python2(self): |
11 | try: | 14 | cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" |
12 | cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" | 15 | output = self._run(cmd) |
13 | output = self._run(cmd) | 16 | self.assertEqual(output, "Hello, world\n") |
14 | self.assertEqual(output, "Hello, world\n") | ||
15 | except subprocess.CalledProcessError as e: | ||
16 | self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) | ||
17 | 17 | ||
18 | class Python3Test(OESDKTestCase): | 18 | class Python3Test(OESDKTestCase): |
19 | def setUp(self): | 19 | def setUp(self): |
@@ -22,9 +22,6 @@ class Python3Test(OESDKTestCase): | |||
22 | raise unittest.SkipTest("No python3 package in the SDK") | 22 | raise unittest.SkipTest("No python3 package in the SDK") |
23 | 23 | ||
24 | def test_python3(self): | 24 | def test_python3(self): |
25 | try: | 25 | cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" |
26 | cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" | 26 | output = self._run(cmd) |
27 | output = self._run(cmd) | 27 | self.assertEqual(output, "Hello, world\n") |
28 | self.assertEqual(output, "Hello, world\n") | ||
29 | except subprocess.CalledProcessError as e: | ||
30 | self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) | ||
diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py index 0860e8d17c..d322f86c73 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py | |||
@@ -9,6 +9,9 @@ from oeqa.sdkext.case import OESDKExtTestCase | |||
9 | from oeqa.core.decorator.oeid import OETestID | 9 | from oeqa.core.decorator.oeid import OETestID |
10 | from oeqa.utils.httpserver import HTTPService | 10 | from oeqa.utils.httpserver import HTTPService |
11 | 11 | ||
12 | from oeqa.utils.subprocesstweak import errors_have_output | ||
13 | errors_have_output() | ||
14 | |||
12 | class DevtoolTest(OESDKExtTestCase): | 15 | class DevtoolTest(OESDKExtTestCase): |
13 | @classmethod | 16 | @classmethod |
14 | def setUpClass(cls): | 17 | def setUpClass(cls): |