Merge branch 'main' into mincore-diff-snapshots

Author: roypat

.buildkite/pipeline_pr.py

@@ -53,6 +53,7 @@
     not changed_files
     or any(x.suffix in [".rs", ".toml", ".lock"] for x in changed_files)
     or any(x.parent.name == "devctr" for x in changed_files)
+    or any(x.name == "test_kani.py" for x in changed_files)
 ):
     kani_grp = pipeline.build_group(
         "🔍 Kani",

tests/integration_tests/test_kani.py

@@ -34,7 +34,7 @@ def test_kani(results_dir):
     # --output-format terse is required by -j
     # -Z unstable-options is needed to enable the other `-Z` flags
     _, stdout, _ = utils.check_output(
-        "cargo kani -Z unstable-options -Z stubbing -Z function-contracts -Z restrict-vtable -j --output-format terse",
+        "cargo kani -Z unstable-options -Z stubbing -Z function-contracts -Z restrict-vtable -j --output-format terse --harness-timeout 40m",
         timeout=TIMEOUT,
     )
 

tools/devctr/poetry.lock

@@ -29,7 +29,7 @@ pytest-timeout = "^2.3.1"
 pytest-xdist = "^3.5"
 python = "^3.10.0"
 PyYAML = "^6.0"
-requests = "^2.32.2"
+requests = "^2.32.4"
 requests-unixsocket2 = "^0.4.0"
 scipy = "^1.11.2"
 setproctitle = "^1.3.2"