mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
778f3ce1e6
commit
5e15b242a4
@@ -2,6 +2,9 @@ import unittest
|
||||
from oeqa.sdk.case import OESDKTestCase
|
||||
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
|
||||
|
||||
from oeqa.utils.subprocesstweak import errors_have_output
|
||||
errors_have_output()
|
||||
|
||||
class BuildCpioTest(OESDKTestCase):
|
||||
td_vars = ['DATETIME']
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@ import unittest
|
||||
from oeqa.sdk.case import OESDKTestCase
|
||||
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
|
||||
|
||||
from oeqa.utils.subprocesstweak import errors_have_output
|
||||
errors_have_output()
|
||||
|
||||
class BuildLzipTest(OESDKTestCase):
|
||||
td_vars = ['DATETIME']
|
||||
|
||||
@@ -5,6 +5,9 @@ import unittest
|
||||
from oeqa.core.utils.path import remove_safe
|
||||
from oeqa.sdk.case import OESDKTestCase
|
||||
|
||||
from oeqa.utils.subprocesstweak import errors_have_output
|
||||
errors_have_output()
|
||||
|
||||
class GccCompileTest(OESDKTestCase):
|
||||
td_vars = ['MACHINE']
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import unittest
|
||||
from oeqa.sdk.case import OESDKTestCase
|
||||
|
||||
from oeqa.utils.subprocesstweak import errors_have_output
|
||||
errors_have_output()
|
||||
|
||||
class PerlTest(OESDKTestCase):
|
||||
def setUp(self):
|
||||
if not (self.tc.hasHostPackage("nativesdk-perl") or
|
||||
@@ -8,9 +11,6 @@ class PerlTest(OESDKTestCase):
|
||||
raise unittest.SkipTest("No perl package in the SDK")
|
||||
|
||||
def test_perl(self):
|
||||
try:
|
||||
cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'"
|
||||
output = self._run(cmd)
|
||||
self.assertEqual(output, "Hello, world")
|
||||
except subprocess.CalledProcessError as e:
|
||||
self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output))
|
||||
cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'"
|
||||
output = self._run(cmd)
|
||||
self.assertEqual(output, "Hello, world")
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import subprocess, unittest
|
||||
from oeqa.sdk.case import OESDKTestCase
|
||||
|
||||
from oeqa.utils.subprocesstweak import errors_have_output
|
||||
errors_have_output()
|
||||
|
||||
class Python2Test(OESDKTestCase):
|
||||
def setUp(self):
|
||||
if not (self.tc.hasHostPackage("nativesdk-python-core") or
|
||||
@@ -8,12 +11,9 @@ class Python2Test(OESDKTestCase):
|
||||
raise unittest.SkipTest("No python package in the SDK")
|
||||
|
||||
def test_python2(self):
|
||||
try:
|
||||
cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\""
|
||||
output = self._run(cmd)
|
||||
self.assertEqual(output, "Hello, world\n")
|
||||
except subprocess.CalledProcessError as e:
|
||||
self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output))
|
||||
cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\""
|
||||
output = self._run(cmd)
|
||||
self.assertEqual(output, "Hello, world\n")
|
||||
|
||||
class Python3Test(OESDKTestCase):
|
||||
def setUp(self):
|
||||
@@ -22,9 +22,6 @@ class Python3Test(OESDKTestCase):
|
||||
raise unittest.SkipTest("No python3 package in the SDK")
|
||||
|
||||
def test_python3(self):
|
||||
try:
|
||||
cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\""
|
||||
output = self._run(cmd)
|
||||
self.assertEqual(output, "Hello, world\n")
|
||||
except subprocess.CalledProcessError as e:
|
||||
self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output))
|
||||
cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\""
|
||||
output = self._run(cmd)
|
||||
self.assertEqual(output, "Hello, world\n")
|
||||
|
||||
@@ -9,6 +9,9 @@ from oeqa.sdkext.case import OESDKExtTestCase
|
||||
from oeqa.core.decorator.oeid import OETestID
|
||||
from oeqa.utils.httpserver import HTTPService
|
||||
|
||||
from oeqa.utils.subprocesstweak import errors_have_output
|
||||
errors_have_output()
|
||||
|
||||
class DevtoolTest(OESDKExtTestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
|
||||
Reference in New Issue
Block a user