From 1528c962fa5129d8c62be367d33c1514365b6822 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Fri, 27 Mar 2020 16:18:35 +0100
Subject: [PATCH] tests: Adjust timeouts to avoid CI failures

The virtual-image test is quite CPU intensive and can take a long time
in the CI setup. Adjust the timeouts so that it runs reliably.
---
 .gitlab-ci.yml    | 2 +-
 tests/meson.build | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 338b035..deb924f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ test:
   script:
     - meson --werror -Ddrivers=all -Db_coverage=true . _build
     - ninja -C _build
-    - meson test -C _build --verbose --no-stdsplit --timeout-multiplier 3
+    - meson test -C _build --verbose --no-stdsplit
     - ninja -C _build coverage
     - cat _build/meson-logs/coverage.txt
   artifacts:
diff --git a/tests/meson.build b/tests/meson.build
index cce5c04..13d669a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -30,6 +30,7 @@ if get_option('introspection')
         unittest_inspector = find_program('unittest_inspector.py')
         base_args = files('virtual-image.py')
         suite = []
+        timeout = 30
 
         r = run_command(unittest_inspector, files('virtual-image.py'))
         unit_tests = r.stdout().strip().split('\n')
@@ -38,6 +39,7 @@ if get_option('introspection')
             suite += 'virtual-image'
         else
             unit_tests = ['virtual-image']
+            timeout = 120
         endif
 
         foreach ut: unit_tests
@@ -53,6 +55,7 @@ if get_option('introspection')
                 suite: ut_suite,
                 depends: libfprint_typelib,
                 env: envs,
+                timeout: timeout,
             )
         endforeach
     else