diff options
Diffstat (limited to 'scripts/test-remote-image')
| -rwxr-xr-x | scripts/test-remote-image | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/scripts/test-remote-image b/scripts/test-remote-image index f3a44ebe51..27b1cae38f 100755 --- a/scripts/test-remote-image +++ b/scripts/test-remote-image @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2014 Intel Corporation # @@ -38,6 +38,7 @@ lib_path = scripts_path + '/lib' sys.path = sys.path + [lib_path] import scriptpath +import argparse_oe # Add meta/lib to sys.path scriptpath.add_oe_lib_path() @@ -82,7 +83,7 @@ log = logger_create() # Define and return the arguments parser for the script def get_args_parser(): description = "This script is used to run automated runtime tests using remotely published image files. You should prepare the build environment just like building local images and running the tests." - parser = argparse.ArgumentParser(description=description) + parser = argparse_oe.ArgumentParser(description=description) parser.add_argument('--image-types', required=True, action="store", nargs='*', dest="image_types", default=None, help='The image types to test(ex: core-image-minimal).') parser.add_argument('--repo-link', required=True, action="store", type=str, dest="repo_link", default=None, help='The link to the remote images repository.') parser.add_argument('--required-packages', required=False, action="store", nargs='*', dest="required_packages", default=None, help='Required packages for the tests. They will be built before the testing begins.') @@ -91,13 +92,11 @@ def get_args_parser(): parser.add_argument('--skip-download', required=False, action="store_true", dest="skip_download", default=False, help='Skip downloading the images completely. This needs the correct files to be present in the directory specified by the target profile.') return parser -class BaseTargetProfile(object): +class BaseTargetProfile(object, metaclass=ABCMeta): """ This class defines the meta profile for a specific target (MACHINE type + image type). """ - __metaclass__ = ABCMeta - def __init__(self, image_type): self.image_type = image_type @@ -190,13 +189,11 @@ class AutoTargetProfile(BaseTargetProfile): return controller.get_extra_files() -class BaseRepoProfile(object): +class BaseRepoProfile(object, metaclass=ABCMeta): """ This class defines the meta profile for an images repository. """ - __metaclass__ = ABCMeta - def __init__(self, repolink, localdir): self.localdir = localdir self.repolink = repolink @@ -288,7 +285,7 @@ class HwAuto(): result = bitbake("%s -c testimage" % image_type, ignore_status=True, postconfig=postconfig) testimage_results = ftools.read_file(os.path.join(get_bb_var("T", image_type), "log.do_testimage")) log.info('Runtime tests results for %s:' % image_type) - print testimage_results + print(testimage_results) return result # Start the procedure! @@ -356,5 +353,5 @@ if __name__ == "__main__": except Exception: ret = 1 import traceback - traceback.print_exc(5) + traceback.print_exc() sys.exit(ret) |