Merge ~iconstantin/ubuntu-security-tools:master into ubuntu-security-tools:master

[Ian Constantin]

Adding timeout factor option to cmd_autopkgtest

Adding this option to allow for increased timeout durations when running autopkgtests locally.

[Alex Murray (alexmurray)]

LGTM - thanks!

review: Approve

[Ian Constantin (iconstantin)]

Thank you Alex!

diff --git a/build-tools/umt b/build-tools/umt
index ae4140e..bc41787 100755
--- a/build-tools/umt
+++ b/build-tools/umt
@@ -2922,6 +2922,8 @@ def cmd_autopkgtest():
                         help="force deletion of ../autopkgtest before running")
     parser.add_argument("-F", "--ignore-failures", dest="ignore_failures", default=False, action='store_true',
                         help="continue even if test failures encountered when running autopkgtests")
+    parser.add_argument("-T", "--timeout-factor", dest="timeout_factor", action='store',
+                        help="Multiplies default timeouts by the provided timeout factor (e.g. --timeout-factor 2 will double all timeout durations)")
     parser.add_argument("-A", "--autopkgtest-config", dest="autopkgtest_config", default=None,
                         help="A configuration file to use to pass extra arguments to autopkgtest (ie gets expanded to @AUTOPKGTEST_CONFIG when passed to autopkgtest)")
     parser.add_argument("--previous-version", dest="previous_version",
@@ -2991,6 +2993,9 @@ def run_autopkgtest_tests(opt, args, details):
             if opt.test_name is not None:
                 cmd.append("--test-name")
                 cmd.append(opt.test_name)
+            if opt.timeout_factor is not None:
+                cmd.append("--timeout-factor")
+                cmd.append(opt.timeout_factor)
             (rc, report) = runcmd(cmd + ["--", "qemu", image] + args,
                                   debug=opt.debug, dry_run=opt.dry_run,
                                   # manually check for error so we can continue
@@ -3027,6 +3032,9 @@ def run_autopkgtest_tests(opt, args, details):
             if opt.test_name is not None:
                 cmd.append("--test-name")
                 cmd.append(opt.test_name)
+            if opt.timeout_factor is not None:
+                cmd.append("--timeout-factor")
+                cmd.append(opt.timeout_factor)
             if opt.ppa is not None:
                 # use add-apt-repository to add the PPA inside the testbed VM -
                 # https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageTests.md#in-a-vm-using-the-ppa