Skip to content

Commit 20d6e50

Browse files
authored
[k2] make k2 CI green again (#1509)
* Disable an aborting of hanging tasks for k2 functional tests Signed-off-by: Petr Shumilov <p.shumilov@vkteam.ru>
1 parent e5006dc commit 20d6e50

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

runtime-light/stdlib/component/inter-component-session/details/function-wrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class function_wrapper final {
6060

6161
template<typename... Arguments>
6262
R operator()(Arguments&&... args) noexcept {
63-
static_assert(std::is_invocable_v<ivoker_type, Arguments...>);
63+
static_assert(std::is_invocable_v<invoker_type, Arguments...>);
6464
kphp::log::assertion(func_obj != nullptr);
6565
return invoker(func_obj, std::forward<Arguments...>(args...));
6666
}
@@ -101,7 +101,7 @@ class function_wrapper final {
101101
std::unique_ptr<void, decltype(std::addressof(raw_mem_free))> raw_mem;
102102
const void* func_obj;
103103
R (*invoker)(const void*, Args...);
104-
using ivoker_type = R (*)(Args...);
104+
using invoker_type = R (*)(Args...);
105105
void (*deleter)(const void*);
106106
};
107107

tests/kphp_ci_pipeline_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
427427
runner.add_test_group(
428428
name="k2-functional-tests",
429429
description="run k2-kphp functional tests with cxx={}".format(args.cxx_name),
430-
cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} KPHP_CXX={cxx_name} K2_BIN={k2_bin} python3 -m pytest --basetemp={base_tempdir} --tb=native -n{jobs} {functional_tests_dir}".format(
430+
cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} KPHP_CXX={cxx_name} K2_BIN={k2_bin} K2_MONITORING_ABORT_HANGING_GLOBAL_TASK=false K2_MONITORING_ABORT_HANGING_REQUEST_TASK=false python3 -m pytest --basetemp={base_tempdir} --tb=native -n{jobs} {functional_tests_dir}".format(
431431
kphp_polyfills_repo=kphp_polyfills_repo,
432432
cxx_name=args.cxx_name,
433433
k2_bin=args.k2_bin,

0 commit comments

Comments
 (0)