Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/rmaptest-timeout into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/2033498

Test shows it can take up to 18.5 minutes to run on some openstack instance.
Bump the timeout threshold to 25 minutes to give it a chance to finish.

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks!

diff --git a/rmaptest/control b/rmaptest/control
index 5bd29ae..1ce4a3f 100644
--- a/rmaptest/control
+++ b/rmaptest/control
@@ -12,4 +12,4 @@ DOC = """
 Create lots of VMAs mapped by lots of tasks.  To tickle objrmap and the
 virtual scan.
 """
-job.run_test('rmaptest', timeout=60*15)
+job.run_test('rmaptest', timeout=60*25)