oetest.py: Add install/uninstall functionality for DUTs
Add the functionality to install/unistall packages in the DUTs without the use of the package manager. This is possible with the extraction introduced in package manager class. testimage and testexport bbclasses has been modified in order to support this new feature. [YOCTO #8694] (From OE-Core rev: b7111d9e9d64d21f57729d1ac1865aea6e54cc8b) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mariano Lopez
Richard Purdie
parent
d9b3ee8b38
commit
938f05333b
|
|
@ -16,6 +16,9 @@
|
|||
|
||||
TEST_LOG_DIR ?= "${WORKDIR}/testexport"
|
||||
TEST_EXPORT_DIR ?= "${TMPDIR}/testexport/${PN}"
|
||||
TEST_EXPORT_PACKAGED_DIR ?= "packages/packaged"
|
||||
TEST_EXPORT_EXTRACTED_DIR ?= "packages/extracted"
|
||||
|
||||
TEST_TARGET ?= "simpleremote"
|
||||
TEST_TARGET_IP ?= ""
|
||||
TEST_SERVER_IP ?= ""
|
||||
|
|
@ -28,9 +31,9 @@ python do_testexport() {
|
|||
}
|
||||
|
||||
addtask testexport
|
||||
do_testimage[nostamp] = "1"
|
||||
do_testimage[depends] += "${TEST_EXPORT_DEPENDS}"
|
||||
do_testimage[lockfiles] += "${TEST_EXPORT_LOCK}"
|
||||
do_testexport[nostamp] = "1"
|
||||
do_testexport[depends] += "${TEST_EXPORT_DEPENDS} ${TESTIMAGEDEPENDS}"
|
||||
do_testexport[lockfiles] += "${TEST_EXPORT_LOCK}"
|
||||
|
||||
def exportTests(d,tc):
|
||||
import json
|
||||
|
|
@ -96,6 +99,9 @@ def exportTests(d,tc):
|
|||
shutil.copytree(foldername, target_folder)
|
||||
if not isfolder:
|
||||
shutil.copy2(mod.path, os.path.join(exportpath, "oeqa/runtime"))
|
||||
json_file = "%s.json" % mod.path.rsplit(".", 1)[0]
|
||||
if os.path.isfile(json_file):
|
||||
shutil.copy2(json_file, os.path.join(exportpath, "oeqa/runtime"))
|
||||
# Get meta layer
|
||||
for layer in d.getVar("BBLAYERS", True).split():
|
||||
if os.path.basename(layer) == "meta":
|
||||
|
|
@ -115,6 +121,20 @@ def exportTests(d,tc):
|
|||
for f in files:
|
||||
shutil.copy2(os.path.join(root, f), os.path.join(exportpath, "oeqa/runtime/files"))
|
||||
|
||||
# Copy packages needed for runtime testing
|
||||
export_pkg_dir = os.path.join(d.getVar("TEST_EXPORT_DIR", True), "packages")
|
||||
test_pkg_dir = d.getVar("TEST_NEEDED_PACKAGES_DIR", True)
|
||||
for root, subdirs, files in os.walk(test_pkg_dir):
|
||||
for subdir in subdirs:
|
||||
tmp_dir = os.path.join(root.replace(test_pkg_dir, "").lstrip("/"), subdir)
|
||||
new_dir = os.path.join(export_pkg_dir, tmp_dir)
|
||||
bb.utils.mkdirhier(new_dir)
|
||||
|
||||
for f in files:
|
||||
src_f = os.path.join(root, f)
|
||||
dst_f = os.path.join(export_pkg_dir, root.replace(test_pkg_dir, "").lstrip("/"), f)
|
||||
shutil.copy2(src_f, dst_f)
|
||||
|
||||
bb.plain("Exported tests to: %s" % exportpath)
|
||||
|
||||
def testexport_main(d):
|
||||
|
|
@ -122,9 +142,11 @@ def testexport_main(d):
|
|||
from oeqa.targetcontrol import get_target_controller
|
||||
from oeqa.utils.dump import get_host_dumper
|
||||
|
||||
test_create_extract_dirs(d)
|
||||
export_dir = d.getVar("TEST_EXPORT_DIR", True)
|
||||
bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True))
|
||||
bb.utils.remove(d.getVar("TEST_EXPORT_DIR", True), recurse=True)
|
||||
bb.utils.mkdirhier(d.getVar("TEST_EXPORT_DIR", True))
|
||||
bb.utils.remove(export_dir, recurse=True)
|
||||
bb.utils.mkdirhier(export_dir)
|
||||
|
||||
# the robot dance
|
||||
target = get_target_controller(d)
|
||||
|
|
@ -141,6 +163,7 @@ def testexport_main(d):
|
|||
import traceback
|
||||
bb.fatal("Loading tests failed:\n%s" % traceback.format_exc())
|
||||
|
||||
tc.extract_packages()
|
||||
exportTests(d,tc)
|
||||
|
||||
testexport_main[vardepsexclude] =+ "BB_ORIGENV"
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@
|
|||
TEST_LOG_DIR ?= "${WORKDIR}/testimage"
|
||||
|
||||
TEST_EXPORT_DIR ?= "${TMPDIR}/testimage/${PN}"
|
||||
TEST_INSTALL_TMP_DIR ?= "${WORKDIR}/testimage/install_tmp"
|
||||
TEST_NEEDED_PACKAGES_DIR ?= "${WORKDIR}/testimage/packages"
|
||||
TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
|
||||
TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
|
||||
|
||||
RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}"
|
||||
MINTESTSUITE = "ping"
|
||||
|
|
@ -100,6 +104,7 @@ testimage_dump_host () {
|
|||
python do_testimage() {
|
||||
testimage_main(d)
|
||||
}
|
||||
|
||||
addtask testimage
|
||||
do_testimage[nostamp] = "1"
|
||||
do_testimage[depends] += "${TESTIMAGEDEPENDS}"
|
||||
|
|
@ -117,6 +122,7 @@ def testimage_main(d):
|
|||
|
||||
pn = d.getVar("PN", True)
|
||||
bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True))
|
||||
test_create_extract_dirs(d)
|
||||
|
||||
# we need the host dumper in test context
|
||||
host_dumper = get_host_dumper(d)
|
||||
|
|
@ -136,6 +142,7 @@ def testimage_main(d):
|
|||
import traceback
|
||||
bb.fatal("Loading tests failed:\n%s" % traceback.format_exc())
|
||||
|
||||
tc.extract_packages()
|
||||
target.deploy()
|
||||
try:
|
||||
target.start()
|
||||
|
|
@ -155,6 +162,17 @@ def testimage_main(d):
|
|||
signal.signal(signal.SIGTERM, tc.origsigtermhandler)
|
||||
target.stop()
|
||||
|
||||
def test_create_extract_dirs(d):
|
||||
install_path = d.getVar("TEST_INSTALL_TMP_DIR", True)
|
||||
package_path = d.getVar("TEST_PACKAGED_DIR", True)
|
||||
extracted_path = d.getVar("TEST_EXTRACTED_DIR", True)
|
||||
bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR", True))
|
||||
bb.utils.remove(package_path, recurse=True)
|
||||
bb.utils.mkdirhier(install_path)
|
||||
bb.utils.mkdirhier(package_path)
|
||||
bb.utils.mkdirhier(extracted_path)
|
||||
|
||||
|
||||
testimage_main[vardepsexclude] =+ "BB_ORIGENV"
|
||||
|
||||
inherit testsdk
|
||||
|
|
|
|||
|
|
@ -81,6 +81,9 @@ class oeRuntimeTest(oeTest):
|
|||
super(oeRuntimeTest, self).__init__(methodName)
|
||||
|
||||
def setUp(self):
|
||||
# Install packages in the DUT
|
||||
self.tc.install_uninstall_packages(self.id())
|
||||
|
||||
# Check if test needs to run
|
||||
if self.tc.sigterm:
|
||||
self.fail("Got SIGTERM")
|
||||
|
|
@ -94,6 +97,9 @@ class oeRuntimeTest(oeTest):
|
|||
pass
|
||||
|
||||
def tearDown(self):
|
||||
# Unistall packages in the DUT
|
||||
self.tc.install_uninstall_packages(self.id(), False)
|
||||
|
||||
res = getResults()
|
||||
# If a test fails or there is an exception dump
|
||||
# for QemuTarget only
|
||||
|
|
@ -281,6 +287,19 @@ class TestContext(object):
|
|||
|
||||
return modules
|
||||
|
||||
def getModulefromID(self, test_id):
|
||||
"""
|
||||
Returns the test module based on a test id.
|
||||
"""
|
||||
|
||||
module_name = ".".join(test_id.split(".")[:3])
|
||||
modules = self.getTestModules()
|
||||
for module in modules:
|
||||
if module.name == module_name:
|
||||
return module
|
||||
|
||||
return None
|
||||
|
||||
def getTests(self, test):
|
||||
'''Return all individual tests executed when running the suite.'''
|
||||
# Unfortunately unittest does not have an API for this, so we have
|
||||
|
|
@ -521,6 +540,43 @@ class RuntimeTestContext(TestContext):
|
|||
shutil.copy2(file_path, dst_dir)
|
||||
shutil.rmtree(pkg_path)
|
||||
|
||||
def install_uninstall_packages(self, test_id, pkg_dir, install):
|
||||
"""
|
||||
Check if the test requires a package and Install/Unistall it in the DUT
|
||||
"""
|
||||
|
||||
test = test_id.split(".")[4]
|
||||
module = self.getModulefromID(test_id)
|
||||
json = self._getJsonFile(module)
|
||||
if json:
|
||||
needed_packages = self._getNeededPackages(json, test)
|
||||
if needed_packages:
|
||||
self._install_uninstall_packages(needed_packages, pkg_dir, install)
|
||||
|
||||
def _install_uninstall_packages(self, needed_packages, pkg_dir, install=True):
|
||||
"""
|
||||
Install/Unistall packages in the DUT without using a package manager
|
||||
"""
|
||||
|
||||
if isinstance(needed_packages, dict):
|
||||
packages = [needed_packages]
|
||||
elif isinstance(needed_packages, list):
|
||||
packages = needed_packages
|
||||
|
||||
for package in packages:
|
||||
pkg = package["pkg"]
|
||||
rm = package.get("rm", False)
|
||||
extract = package.get("extract", True)
|
||||
src_dir = os.path.join(pkg_dir, pkg)
|
||||
|
||||
# Install package
|
||||
if install and extract:
|
||||
self.target.connection.copy_dir_to(src_dir, "/")
|
||||
|
||||
# Unistall package
|
||||
elif not install and rm:
|
||||
self.target.connection.delete_dir_structure(src_dir, "/")
|
||||
|
||||
class ImageTestContext(RuntimeTestContext):
|
||||
def __init__(self, d, target, host_dumper):
|
||||
super(ImageTestContext, self).__init__(d, target)
|
||||
|
|
@ -536,11 +592,29 @@ class ImageTestContext(RuntimeTestContext):
|
|||
self.sigterm = True
|
||||
self.target.stop()
|
||||
|
||||
def install_uninstall_packages(self, test_id, install=True):
|
||||
"""
|
||||
Check if the test requires a package and Install/Unistall it in the DUT
|
||||
"""
|
||||
|
||||
pkg_dir = self.d.getVar("TEST_EXTRACTED_DIR", True)
|
||||
super(ImageTestContext, self).install_uninstall_packages(test_id, pkg_dir, install)
|
||||
|
||||
class ExportTestContext(RuntimeTestContext):
|
||||
def __init__(self, d, target, exported=False):
|
||||
super(ExportTestContext, self).__init__(d, target, exported)
|
||||
self.sigterm = None
|
||||
|
||||
def install_uninstall_packages(self, test_id, install=True):
|
||||
"""
|
||||
Check if the test requires a package and Install/Unistall it in the DUT
|
||||
"""
|
||||
|
||||
export_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||
extracted_dir = self.d.getVar("TEST_EXPORT_EXTRACTED_DIR", True)
|
||||
pkg_dir = os.path.join(export_dir, extracted_dir)
|
||||
super(ExportTestContext, self).install_uninstall_packages(test_id, pkg_dir, install)
|
||||
|
||||
class SDKTestContext(TestContext):
|
||||
def __init__(self, d, sdktestdir, sdkenv, tcname, *args):
|
||||
super(SDKTestContext, self).__init__(d)
|
||||
|
|
|
|||
Loading…
Reference in New Issue