Remove test references to generate_rfc0015_branch_protection_rules

Author: rkoster

orgs/test_org_management.py

@@ -164,8 +164,6 @@
   bots:
   - github: bot-wg1-a5
     name: WG3 Area5 Bot
-config:
-  generate_rfc0015_branch_protection_rules: true
 """
 
 wg4_other_org = """
@@ -206,8 +204,6 @@
   - cloudfoundry2/repo3
   - cloudfoundry2/repo4
   - cloudfoundry/repo5
-config:
-  generate_rfc0015_branch_protection_rules: true
 """
 
 toc = """
@@ -231,7 +227,6 @@
   repositories:
   - cloudfoundry/community
 config:
-  generate_rfc0015_branch_protection_rules: true
   github_project_sync:
     mapping:
       cloudfoundry: 31
@@ -732,8 +727,8 @@ def test_generate_branch_protection(self):
         bp_repos = o.branch_protection["branch-protection"]["orgs"]["cloudfoundry"]["repos"]
         # TOC and wg3 opted in, wg1 and wg2 not
         # note: repo1..4 are shared between wg1 (opt out) and wg3 (opt in) - wg3 wins
-        self.assertSetEqual({f"repo{i}" for i in range(1, 6)} | {"community"}, set(bp_repos.keys()))
-        # repo1 has static config that wins over generated branch protection rules
+        self.assertSetEqual({f"repo{i}" for i in list(range(1, 6)) + [10, 11]} | {"community"}, set(bp_repos.keys()))
+        # repo1 has static config that wins over generated branch protection rulesp
         self.assertTrue(bp_repos["repo1"]["protect"])
         self.assertNotIn("required_pull_request_reviews", bp_repos["repo1"])
 
@@ -749,7 +744,7 @@ def test_generate_branch_protection_multiple_orgs(self):
         bp_repos = o.branch_protection["branch-protection"]["orgs"]["cloudfoundry"]["repos"]
         # TOC and wg3 opted in, wg1 and wg2 not
         # note: repo1..4 are shared between wg1 (opt out) and wg3 (opt in) - wg3 wins
-        self.assertSetEqual({f"repo{i}" for i in range(1, 6)} | {"community"}, set(bp_repos.keys()))
+        self.assertSetEqual({f"repo{i}" for i in list(range(1, 6)) + [10, 11]} | {"community"}, set(bp_repos.keys()))
         # repo1 has static config that wins over generated branch protection rules
         self.assertTrue(bp_repos["repo1"]["protect"])
         self.assertNotIn("required_pull_request_reviews", bp_repos["repo1"])