From 89218cd110711f49ef30ae0e1260a711ae3da1dd Mon Sep 17 00:00:00 2001 From: Andrii V Date: Thu, 3 Jul 2025 22:14:41 +0200 Subject: [PATCH] add some tests ingored --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2e5011c8..80a4e0c2 100644 --- a/Makefile +++ b/Makefile @@ -124,17 +124,17 @@ test-fast: --ignore=rhodecode/apps/file_store/tests \ --ignore=rhodecode/tests/vcs_operations \ --ignore=rhodecode/tests/database \ - -k "not (test_api_merge_pull_request or test_api_merge_pull_request_as_another_user or (test_filestore_backends and objectstore) or test_merge_pull_request_enabled)" + -k "not (test_api_merge_pull_request or test_api_merge_pull_request_as_another_user or (test_filestore_backends and objectstore) or test_merge_pull_request_enabled or test_merge_pull_request_forbidden_by_pre_push_hook or test_merge_rebase_source_is_updated_bookmark)" .PHONY: test-dev # test-dev: Run tests skipping known problematic tests (merge PR, objectstore backend issues) test-dev: - PYTHONHASHSEED=random \ - py.test -r xw -p no:sugar \ + PYTHONHASHSEED=random PYTHONWARNINGS=ignore \ + py.test -q -p no:sugar --tb=short --log-cli-level=WARNING \ --ignore=rhodecode/tests/vcs_operations \ --ignore=rhodecode/tests/database \ - -k "not (test_api_merge_pull_request or test_api_merge_pull_request_as_another_user or (test_filestore_backends and objectstore) or test_merge_pull_request_enabled)" \ + -k "not (test_api_merge_pull_request or test_api_merge_pull_request_as_another_user or (test_filestore_backends and objectstore) or test_merge_pull_request_enabled or test_merge_pull_request_forbidden_by_pre_push_hook or test_merge_rebase_source_is_updated_bookmark)" \ rhodecode # >>> Docs commands