summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuval Peress <peress@chromium.org>2021-06-08 20:57:21 -0600
committerCommit Bot <commit-bot@chromium.org>2021-06-09 17:55:11 +0000
commitae1b0032c195c28e0f8132f4133ed361f6a2ff90 (patch)
treeed3fd3b6635bf735ce7d71c5b2d145115800d037
parent744efbfcc729d08c0d6228a625afb03f30a6d4aa (diff)
downloadchrome-ec-ae1b0032c195c28e0f8132f4133ed361f6a2ff90.tar.gz
zmake: fix test timeout
In CQ some tests that require file access may take a long time. Update the deadline for the tests to 1 minute which matches the deadline of tests in test_util.py. BRANCH=none BUG=b:188492664 TEST=run pytest (but the real test will be in CQ) Signed-off-by: Yuval Peress <peress@chromium.org> Change-Id: I00b15667bf4bdbbfe8101b21a58aefdce6d4ec91 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2948164 Reviewed-by: Denis Brockus <dbrockus@chromium.org>
-rw-r--r--zephyr/zmake/tests/test_build_config.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/zephyr/zmake/tests/test_build_config.py b/zephyr/zmake/tests/test_build_config.py
index f80e419c5f..8f60f6dcf8 100644
--- a/zephyr/zmake/tests/test_build_config.py
+++ b/zephyr/zmake/tests/test_build_config.py
@@ -130,6 +130,7 @@ def parse_cmake_args(argv):
@hypothesis.given(build_configs_no_kconfig, paths, paths)
+@hypothesis.settings(deadline=60000)
def test_popen_cmake_no_kconfig(conf, project_dir, build_dir):
"""Test popen_cmake for a config with no kconfig definitions."""
job_client = FakeJobClient()
@@ -142,6 +143,7 @@ def test_popen_cmake_no_kconfig(conf, project_dir, build_dir):
@hypothesis.given(build_configs_with_at_least_one_kconfig, paths, paths)
+@hypothesis.settings(deadline=60000)
def test_popen_cmake_kconfig_but_no_file(conf, project_dir, build_dir):
"""Test that running popen_cmake with Kconfig definitions to write
out, but no path to do so, should raise an error.
@@ -153,7 +155,7 @@ def test_popen_cmake_kconfig_but_no_file(conf, project_dir, build_dir):
@hypothesis.given(build_configs, paths, paths)
-@hypothesis.settings(deadline=None)
+@hypothesis.settings(deadline=60000)
def test_popen_cmake_kconfig(conf, project_dir, build_dir):
job_client = FakeJobClient()