support/testing: use .assertRunOk() when possible

The BRTest() class implements an assertRunOk() method that does the
very common work of running a command inside the emulator, and
checking that it is successful.

This commit changes all locations where this .assertRunOk() method can
be used, instead of open-coding the same logic.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni
2021-06-26 15:32:38 +02:00
committed by Yann E. MORIN
parent f579afc393
commit afc1ed4d51
24 changed files with 51 additions and 91 deletions

View File

@@ -20,21 +20,18 @@ class TestPythonBase(infra.basetest.BRTest):
def version_test(self, version, timeout=-1):
cmd = self.interpreter + " --version 2>&1 | grep '^{}'".format(version)
_, exit_code = self.emulator.run(cmd, timeout)
self.assertEqual(exit_code, 0)
self.assertRunOk(cmd, timeout)
def math_floor_test(self, timeout=-1):
cmd = self.interpreter + " -c 'import math; math.floor(12.3)'"
_, exit_code = self.emulator.run(cmd, timeout)
self.assertEqual(exit_code, 0)
self.assertRunOk(cmd, timeout)
def libc_time_test(self, timeout=-1):
cmd = self.interpreter + " -c 'from __future__ import print_function;"
cmd += "import ctypes;"
cmd += "libc = ctypes.cdll.LoadLibrary(\"libc.so.1\");"
cmd += "print(libc.time(None))'"
_, exit_code = self.emulator.run(cmd, timeout)
self.assertEqual(exit_code, 0)
self.assertRunOk(cmd, timeout)
def zlib_test(self, timeout=-1):
cmd = self.interpreter + " -c 'import zlib'"
@@ -116,8 +113,7 @@ class TestPythonPackageBase(TestPythonBase):
"""Run each script previously added to the image."""
for script in self.sample_scripts:
cmd = self.interpreter + " " + os.path.basename(script)
_, exit_code = self.emulator.run(cmd, timeout=self.timeout)
self.assertEqual(exit_code, 0)
self.assertRunOk(cmd, timeout=self.timeout)
def test_run(self):
self.login()