revert: "fix(rules): counting of faulty rules (#3740)" (#3756)

The test_teams test does not pass anymore with the reverted change.

This reverts commit 6825909.

Change-Id: I6e59be87a714dd8527681a1af0ee0bea10ac8c5a

mergify_engine/rules/__init__.py

@@ -245,7 +245,7 @@ async def create(
                     self.ignored_rules.append(typing.cast(T_EvaluatedRule, rule))
                     categorized = True
 
-                if not categorized and base_conditions.is_faulty():
+                if not categorized and rule.conditions.is_faulty():
                     self.faulty_rules.append(typing.cast(T_EvaluatedRule, rule))
                     categorized = True
 

zfixtures/cassettes/TestEngineV2Scenario/test_teams/config.json

@@ -1 +1 @@
-{"organization_id": 40527191, "organization_name": "mergifyio-testing", "repository_id": 399426199, "repository_name": "functional-testing-repo-sileht", "branch_prefix": "20211129151726"}
+{"organization_id": 40527191, "organization_name": "mergifyio-testing", "repository_id": 399426199, "repository_name": "functional-testing-repo-sileht", "branch_prefix": "20211209091254"}

zfixtures/cassettes/TestEngineV2Scenario/test_teams/git-1.json

@@ -1 +1 @@
-[{"args": ["version"], "kwargs": {}, "out": "git version 2.34.1\n"}, {"args": ["init", "--initial-branch=tmp-mergify-trunk"], "kwargs": {}, "out": "Initialized empty Git repository in /tmp/mergify-gitteruzvmle08/.git/\n"}, {"args": ["config", "core.repositoryformatversion", "1"], "kwargs": {}, "out": ""}, {"args": ["config", "gc.auto", "0"], "kwargs": {}, "out": ""}, {"args": ["config", "user.name", "mergify-bot"], "kwargs": {}, "out": ""}, {"args": ["config", "user.email", "noreply@mergify.com"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.useHttpPath", "true"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.helper", "cache --timeout=300 --socket=/tmp/mergify-gitter<random>/.git/creds/socket"], "kwargs": {}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"_input": "url=https://<TOKEN>:@github.com/mergifyio-testing/functional-testing-repo-sileht\n\n"}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"_input": "url=https://<TOKEN>:@github.com/mergify-test2/functional-testing-repo-sileht\n\n"}, "out": ""}, {"args": ["config", "user.name", "mergify-tester"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "origin", "https://github.com/mergifyio-testing/functional-testing-repo-sileht"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "fork", "https://github.com/mergify-test2/functional-testing-repo-sileht"], "kwargs": {}, "out": ""}, {"args": ["add", ".mergify.yml"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "initial commit"], "kwargs": {}, "out": "[tmp-mergify-trunk (root-commit) 315cffc] initial commit\n 1 file changed, 33 insertions(+)\n create mode 100644 .mergify.yml\n"}, {"args": ["branch", "-M", "20211129151726/test_teams/main"], "kwargs": {}, "out": ""}, {"args": ["push", "--quiet", "origin", "20211129151726/test_teams/main"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for '20211129151726/test_teams/main' on GitHub by visiting:        \nremote:      https://github.com/mergifyio-testing/functional-testing-repo-sileht/pull/new/20211129151726/test_teams/main        \nremote: \n"}, {"args": ["push", "--quiet", "fork", "20211129151726/test_teams/main"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for '20211129151726/test_teams/main' on GitHub by visiting:        \nremote:      https://github.com/mergify-test2/functional-testing-repo-sileht/pull/new/20211129151726/test_teams/main        \nremote: \n"}, {"args": ["checkout", "--quiet", "fork/20211129151726/test_teams/main", "-b", "20211129151726/test_teams/fork/pr1"], "kwargs": {}, "out": ""}, {"args": ["add", "test1"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "test_teams: pull request n1 from fork"], "kwargs": {}, "out": "[20211129151726/test_teams/fork/pr1 656bad6] test_teams: pull request n1 from fork\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 test1\n"}, {"args": ["push", "--quiet", "fork", "20211129151726/test_teams/fork/pr1"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for '20211129151726/test_teams/fork/pr1' on GitHub by visiting:        \nremote:      https://github.com/mergify-test2/functional-testing-repo-sileht/pull/new/20211129151726/test_teams/fork/pr1        \nremote: \n"}, {"args": ["credential-cache", "--socket=/tmp/mergify-gitter<random>/.git/creds/socket", "exit"], "kwargs": {}, "out": ""}]
+[{"args": ["version"], "kwargs": {}, "out": "git version 2.34.1\n"}, {"args": ["init", "--initial-branch=tmp-mergify-trunk"], "kwargs": {}, "out": "Initialized empty Git repository in /tmp/mergify-gitter2h255ejf/.git/\n"}, {"args": ["config", "core.repositoryformatversion", "1"], "kwargs": {}, "out": ""}, {"args": ["config", "gc.auto", "0"], "kwargs": {}, "out": ""}, {"args": ["config", "user.name", "mergify-bot"], "kwargs": {}, "out": ""}, {"args": ["config", "user.email", "noreply@mergify.com"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.useHttpPath", "true"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.helper", "cache --timeout=300 --socket=/tmp/mergify-gitter<random>/.git/creds/socket"], "kwargs": {}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"_input": "url=https://<TOKEN>:@github.com/mergifyio-testing/functional-testing-repo-sileht\n\n"}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"_input": "url=https://<TOKEN>:@github.com/mergify-test2/functional-testing-repo-sileht\n\n"}, "out": ""}, {"args": ["config", "user.name", "mergify-tester"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "origin", "https://github.com/mergifyio-testing/functional-testing-repo-sileht"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "fork", "https://github.com/mergify-test2/functional-testing-repo-sileht"], "kwargs": {}, "out": ""}, {"args": ["add", ".mergify.yml"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "initial commit"], "kwargs": {}, "out": "[tmp-mergify-trunk (root-commit) eb70e12] initial commit\n 1 file changed, 33 insertions(+)\n create mode 100644 .mergify.yml\n"}, {"args": ["branch", "-M", "20211209091254/test_teams/main"], "kwargs": {}, "out": ""}, {"args": ["push", "--quiet", "origin", "20211209091254/test_teams/main"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for '20211209091254/test_teams/main' on GitHub by visiting:        \nremote:      https://github.com/mergifyio-testing/functional-testing-repo-sileht/pull/new/20211209091254/test_teams/main        \nremote: \n"}, {"args": ["push", "--quiet", "fork", "20211209091254/test_teams/main"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for '20211209091254/test_teams/main' on GitHub by visiting:        \nremote:      https://github.com/mergify-test2/functional-testing-repo-sileht/pull/new/20211209091254/test_teams/main        \nremote: \n"}, {"args": ["checkout", "--quiet", "fork/20211209091254/test_teams/main", "-b", "20211209091254/test_teams/fork/pr1"], "kwargs": {}, "out": ""}, {"args": ["add", "test1"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "test_teams: pull request n1 from fork"], "kwargs": {}, "out": "[20211209091254/test_teams/fork/pr1 2ae3cd2] test_teams: pull request n1 from fork\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 test1\n"}, {"args": ["push", "--quiet", "fork", "20211209091254/test_teams/fork/pr1"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for '20211209091254/test_teams/fork/pr1' on GitHub by visiting:        \nremote:      https://github.com/mergify-test2/functional-testing-repo-sileht/pull/new/20211209091254/test_teams/fork/pr1        \nremote: \n"}, {"args": ["credential-cache", "--socket=/tmp/mergify-gitter<random>/.git/creds/socket", "exit"], "kwargs": {}, "out": ""}]