Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikita Unisikhin committed Dec 5, 2024
1 parent 164054b commit dabd301
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 501 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ export DEB_BUILD_DISTRIBUTION ?=


define ensure_poetry
if [ ! -e $(POETRY) ]; then
echo "Poetry could not be found. Please install it manually 'make install-poetry'";
exit 1;
if [ ! -e $(POETRY) ]; then \
echo "Poetry could not be found. Please install it manually 'make install-poetry'"; \
exit 1; \
fi
endef

Expand Down Expand Up @@ -203,9 +203,9 @@ test-unit: install-deps

.PHONY: test-integration
test-integration: install-deps build-python-packages
cd $(TESTS_DIR)
export PYTHONPATH=$(CURDIR):$$PATH
$(POETRY) run behave --show-timings --stop --junit $(BEHAVE_ARGS)
cd $(TESTS_DIR) && \
export PYTHONPATH=$(CURDIR):$$PATH && \
$(POETRY) run behave --show-timings --stop --junit $(BEHAVE_ARGS) -i monrun.feature


.PHONY: publish
Expand Down
4 changes: 2 additions & 2 deletions ch_tools/monrun_checks/ch_orphaned_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ch_tools.chadmin.internal.zookeeper import get_zk_node
from ch_tools.common.result import CRIT, OK, WARNING, Result

ERROR_MESSAGE_PATTERN = r"(Code:\s\d+\.\sDB::Exception:\s).*(\s\([A-Z_]*\)\s\(version\s.*\s\(official build\)\)).*"
ERROR_MESSAGE_PATTERN = r"(Code:\s\d+\.\sDB::Exception:\s).*(\s\([A-Z_]*\)\s\(version\s.*\s\(official build\)\)\s).*"


@click.command("orphaned-objects")
Expand Down Expand Up @@ -107,5 +107,5 @@ def _zk_get_orphaned_objects_state(


def _error_message_format(error_msg: str) -> str:
error_msg = re.sub(ERROR_MESSAGE_PATTERN, r"\1...\2", error_msg)
error_msg = re.sub(ERROR_MESSAGE_PATTERN, r"\1...\2...", error_msg)
return error_msg
Loading

0 comments on commit dabd301

Please sign in to comment.