Merge "Separate connection registries in tests"

tests/base.py

@@ -14,6 +14,7 @@
 # under the License.
 
 import configparser
+from collections import OrderedDict
 from configparser import ConfigParser
 from contextlib import contextmanager
 import copy
@@ -31,7 +32,7 @@ import random
 import re
 from logging import Logger
 from queue import Queue
-from typing import Callable, Optional, Any, Iterable, Generator, List
+from typing import Callable, Optional, Any, Iterable, Generator, List, Dict
 
 import requests
 import select
@@ -64,6 +65,21 @@ from git.exc import NoSuchPathError
 import yaml
 import paramiko
 
+from zuul.model import Change
+from zuul.rpcclient import RPCClient
+
+from zuul.driver.zuul import ZuulDriver
+from zuul.driver.git import GitDriver
+from zuul.driver.smtp import SMTPDriver
+from zuul.driver.github import GithubDriver
+from zuul.driver.timer import TimerDriver
+from zuul.driver.sql import SQLDriver
+from zuul.driver.bubblewrap import BubblewrapDriver
+from zuul.driver.nullwrap import NullwrapDriver
+from zuul.driver.mqtt import MQTTDriver
+from zuul.driver.pagure import PagureDriver
+from zuul.driver.gitlab import GitlabDriver
+from zuul.driver.gerrit import GerritDriver
 from zuul.driver.github.githubconnection import GithubClientManager
 from zuul.lib.connections import ConnectionRegistry
 from psutil import Popen
@@ -165,6 +181,162 @@ def never_capture():
     return decorator
 
 
+class GerritDriverMock(GerritDriver):
+    def __init__(self, registry, changes: Dict[str, Dict[str, Change]],
+                 upstream_root: str, additional_event_queues, poller_events,
+                 add_cleanup: Callable[[Callable[[], None]], None]):
+        super(GerritDriverMock, self).__init__()
+        self.registry = registry
+        self.changes = changes
+        self.upstream_root = upstream_root
+        self.additional_event_queues = additional_event_queues
+        self.poller_events = poller_events
+        self.add_cleanup = add_cleanup
+
+    def getConnection(self, name, config):
+        db = self.changes.setdefault(config['server'], {})
+        poll_event = self.poller_events.setdefault(name, threading.Event())
+        ref_event = self.poller_events.setdefault(name + '-ref',
+                                                  threading.Event())
+        connection = FakeGerritConnection(
+            self, name, config,
+            changes_db=db,
+            upstream_root=self.upstream_root,
+            poller_event=poll_event,
+            ref_watcher_event=ref_event)
+        if connection.web_server:
+            self.add_cleanup(connection.web_server.stop)
+
+        self.additional_event_queues.append(connection.event_queue)
+        setattr(self.registry, 'fake_' + name, connection)
+        return connection
+
+
+class GithubDriverMock(GithubDriver):
+    def __init__(self, registry, changes: Dict[str, Dict[str, Change]],
+                 config: ConfigParser, upstream_root: str,
+                 additional_event_queues, rpcclient: RPCClient,
+                 git_url_with_auth: bool):
+        super(GithubDriverMock, self).__init__()
+        self.registry = registry
+        self.changes = changes
+        self.config = config
+        self.upstream_root = upstream_root
+        self.additional_event_queues = additional_event_queues
+        self.rpcclient = rpcclient
+        self.git_url_with_auth = git_url_with_auth
+
+    def registerGithubProjects(self, connection):
+        path = self.config.get('scheduler', 'tenant_config')
+        with open(os.path.join(FIXTURE_DIR, path)) as f:
+            tenant_config = yaml.safe_load(f.read())
+        for tenant in tenant_config:
+            sources = tenant['tenant']['source']
+            conf = sources.get(connection.source.name)
+            if not conf:
+                return
+
+            projects = conf.get('config-projects', [])
+            projects.extend(conf.get('untrusted-projects', []))
+
+            client = connection.getGithubClient(None)
+            for project in projects:
+                if isinstance(project, dict):
+                    # This can be a dict with the project as the only key
+                    client.addProjectByName(
+                        list(project.keys())[0])
+                else:
+                    client.addProjectByName(project)
+
+    def getConnection(self, name, config):
+        server = config.get('server', 'github.com')
+        db = self.changes.setdefault(server, {})
+        connection = FakeGithubConnection(
+            self, name, config, self.rpcclient,
+            changes_db=db,
+            upstream_root=self.upstream_root,
+            git_url_with_auth=self.git_url_with_auth)
+        self.additional_event_queues.append(connection.event_queue)
+        setattr(self.registry, 'fake_' + name, connection)
+        self.registerGithubProjects(connection)
+        return connection
+
+
+class PagureDriverMock(PagureDriver):
+    def __init__(self, registry, changes: Dict[str, Dict[str, Change]],
+                 upstream_root: str, additional_event_queues,
+                 rpcclient: RPCClient):
+        super(PagureDriverMock, self).__init__()
+        self.registry = registry
+        self.changes = changes
+        self.upstream_root = upstream_root
+        self.additional_event_queues = additional_event_queues
+        self.rpcclient = rpcclient
+
+    def getConnection(self, name, config):
+        server = config.get('server', 'pagure.io')
+        db = self.changes.setdefault(server, {})
+        connection = FakePagureConnection(
+            self, name, config, self.rpcclient,
+            changes_db=db,
+            upstream_root=self.upstream_root)
+        self.additional_event_queues.append(connection.event_queue)
+        setattr(self.registry, 'fake_' + name, connection)
+        return connection
+
+
+class GitlabDriverMock(GitlabDriver):
+    def __init__(self, registry, changes: Dict[str, Dict[str, Change]],
+                 upstream_root: str, additional_event_queues,
+                 rpcclient: RPCClient):
+        super(GitlabDriverMock, self).__init__()
+        self.registry = registry
+        self.changes = changes
+        self.upstream_root = upstream_root
+        self.additional_event_queues = additional_event_queues
+        self.rpcclient = rpcclient
+
+    def getConnection(self, name, config):
+        server = config.get('server', 'gitlab.com')
+        db = self.changes.setdefault(server, {})
+        connection = FakeGitlabConnection(
+            self, name, config, self.rpcclient,
+            changes_db=db,
+            upstream_root=self.upstream_root)
+        self.additional_event_queues.append(connection.event_queue)
+        setattr(self.registry, 'fake_' + name, connection)
+        return connection
+
+
+class TestConnectionRegistry(ConnectionRegistry):
+    def __init__(self, changes: Dict[str, Dict[str, Change]],
+                 config: ConfigParser, additional_event_queues,
+                 upstream_root: str, rpcclient: RPCClient, poller_events,
+                 git_url_with_auth: bool,
+                 add_cleanup: Callable[[Callable[[], None]], None]):
+        self.connections = OrderedDict()
+        self.drivers = {}
+
+        self.registerDriver(ZuulDriver())
+        self.registerDriver(GerritDriverMock(
+            self, changes, upstream_root, additional_event_queues,
+            poller_events, add_cleanup))
+        self.registerDriver(GitDriver())
+        self.registerDriver(GithubDriverMock(
+            self, changes, config, upstream_root, additional_event_queues,
+            rpcclient, git_url_with_auth))
+        self.registerDriver(SMTPDriver())
+        self.registerDriver(TimerDriver())
+        self.registerDriver(SQLDriver())
+        self.registerDriver(BubblewrapDriver())
+        self.registerDriver(NullwrapDriver())
+        self.registerDriver(MQTTDriver())
+        self.registerDriver(PagureDriverMock(
+            self, changes, upstream_root, additional_event_queues, rpcclient))
+        self.registerDriver(GitlabDriverMock(
+            self, changes, upstream_root, additional_event_queues, rpcclient))
+
+
 class FakeAnsibleManager(zuul.lib.ansible.AnsibleManager):
 
     def validate(self):
@@ -3384,17 +3556,23 @@ class WebProxyFixture(fixtures.Fixture):
 
 
 class ZuulWebFixture(fixtures.Fixture):
-    def __init__(self, gearman_server_port, config, test_root, info=None,
+    def __init__(self, gearman_server_port,
-                 zk_hosts=None):
+                 changes: Dict[str, Dict[str, Change]], config: ConfigParser,
+                 additional_event_queues, upstream_root: str,
+                 rpcclient: RPCClient, poller_events, git_url_with_auth: bool,
+                 add_cleanup: Callable[[Callable[[], None]], None],
+                 test_root, info=None, zk_hosts=None):
         super(ZuulWebFixture, self).__init__()
         self.gearman_server_port = gearman_server_port
-        self.connections = zuul.lib.connections.ConnectionRegistry()
+        self.connections = TestConnectionRegistry(
+            changes, config, additional_event_queues, upstream_root, rpcclient,
+            poller_events, git_url_with_auth, add_cleanup)
         self.connections.configure(
             config,
             include_drivers=[zuul.driver.sql.SQLDriver,
-                             zuul.driver.github.GithubDriver,
+                             GithubDriverMock,
-                             zuul.driver.gitlab.GitlabDriver,
+                             GitlabDriverMock,
-                             zuul.driver.pagure.PagureDriver])
+                             PagureDriverMock])
         self.authenticators = zuul.lib.auth.AuthenticatorRegistry()
         self.authenticators.configure(config)
         if info is None:
@@ -3639,10 +3817,16 @@ class SymLink(object):
 
 class SchedulerTestApp:
     def __init__(self, log: Logger, config: ConfigParser, zk_config: str,
-                 connections: ConnectionRegistry):
+                 changes: Dict[str, Dict[str, Change]],
+                 additional_event_queues, upstream_root: str,
+                 rpcclient: RPCClient, poller_events, git_url_with_auth: bool,
+                 source_only: bool,
+                 add_cleanup: Callable[[Callable[[], None]], None]):
+
         self.log = log
         self.config = config
         self.zk_config = zk_config
+        self.changes = changes
 
         self.sched = zuul.scheduler.Scheduler(self.config)
         self.sched.setZuulApp(self)
@@ -3654,7 +3838,14 @@ class SchedulerTestApp:
             self.sched.management_event_queue
         ]
 
-        self.sched.registerConnections(connections)
+        # Register connections from the config using fakes
+        self.connections = TestConnectionRegistry(
+            self.changes, self.config, additional_event_queues,
+            upstream_root, rpcclient, poller_events,
+            git_url_with_auth, add_cleanup)
+        self.connections.configure(self.config, source_only=source_only)
+
+        self.sched.registerConnections(self.connections)
 
         executor_client = zuul.executor.client.ExecutorClient(
             self.config, self.sched)
@@ -3697,8 +3888,15 @@ class SchedulerTestManager:
         self.instances = []
 
     def create(self, log: Logger, config: ConfigParser, zk_config: str,
-               connections: ConnectionRegistry) -> SchedulerTestApp:
+               changes: Dict[str, Dict[str, Change]], additional_event_queues,
-        app = SchedulerTestApp(log, config, zk_config, connections)
+               upstream_root: str, rpcclient: RPCClient, poller_events,
+               git_url_with_auth: bool, source_only: bool,
+               add_cleanup: Callable[[Callable[[], None]], None])\
+            -> SchedulerTestApp:
+        app = SchedulerTestApp(log, config, zk_config, changes,
+                               additional_event_queues, upstream_root,
+                               rpcclient, poller_events, git_url_with_auth,
+                               source_only, add_cleanup)
         self.instances.append(app)
         return app
 
@@ -3799,20 +3997,31 @@ class ZuulTestCase(BaseTestCase):
 
     """
 
-    config_file = 'zuul.conf'
+    config_file: str = 'zuul.conf'
-    run_ansible = False
+    run_ansible: bool = False
-    create_project_keys = False
+    create_project_keys: bool = False
-    use_ssl = False
+    use_ssl: bool = False
-    git_url_with_auth = False
+    git_url_with_auth: bool = False
-    log_console_port = 19885
+    log_console_port: int = 19885
+    source_only: bool = False
 
-    def __init__(self, *args, **kwargs):
+    def __getattr__(self, name):
-        super().__init__(*args, **kwargs)
+        """Allows to access fake connections the old way, e.g., using
-        self.fake_gerrit = None
+        `fake_gerrit` for FakeGerritConnection.
+
+        This will access the connection of the first (default) scheduler
+        (`self.scheds.first`). To access connections of a different
+        scheduler use `self.scheds[{X}].connections.fake_{NAME}`.
+        """
+        if name.startswith('fake_') and\
+                hasattr(self.scheds.first.connections, name):
+            return getattr(self.scheds.first.connections, name)
+        raise AttributeError("'ZuulTestCase' object has no attribute '%s'"
+                             % name)
 
     def _startMerger(self):
-        self.merge_server = zuul.merger.server.MergeServer(self.config,
+        self.merge_server = zuul.merger.server.MergeServer(
-                                                           self.connections)
+            self.config, self.scheds.first.connections)
         self.merge_server.start()
 
     def setUp(self):
@@ -3915,12 +4124,21 @@ class ZuulTestCase(BaseTestCase):
         gerritsource.GerritSource.replication_retry_interval = 0.5
         gerritconnection.GerritEventConnector.delay = 0.0
 
+        self.changes: Dict[str, Dict[str, Change]] = {}
+
         self.additional_event_queues = []
         self.poller_events = {}
-        self.configure_connections()
+        self._configureSmtp()
+        self._configureMqtt()
 
+        executor_connections = TestConnectionRegistry(
+            self.changes, self.config, self.additional_event_queues,
+            self.upstream_root, self.rpcclient, self.poller_events,
+            self.git_url_with_auth, self.addCleanup)
+        executor_connections.configure(self.config,
+                                       source_only=self.source_only)
         self.executor_server = RecordingExecutorServer(
-            self.config, self.connections,
+            self.config, executor_connections,
             jobdir_root=self.jobdir_root,
             _run_ansible=self.run_ansible,
             _test_root=self.test_root,
@@ -3932,7 +4150,10 @@ class ZuulTestCase(BaseTestCase):
 
         self.scheds = SchedulerTestManager()
         self.scheds.create(
-            self.log, self.config, self.zk_config, self.connections)
+            self.log, self.config, self.zk_config, self.changes,
+            self.additional_event_queues, self.upstream_root, self.rpcclient,
+            self.poller_events, self.git_url_with_auth, self.source_only,
+            self.addCleanup)
 
         if hasattr(self, 'fake_github'):
             self.additional_event_queues.append(
@@ -3951,108 +4172,7 @@ class ZuulTestCase(BaseTestCase):
         return [item for sublist in sched_queues for item in sublist] + \
             self.additional_event_queues
 
-    def configure_connections(self, source_only=False):
+    def _configureSmtp(self):
-        # Set up gerrit related fakes
-        # Set a changes database so multiple FakeGerrit's can report back to
-        # a virtual canonical database given by the configured hostname
-        self.gerrit_changes_dbs = {}
-        self.github_changes_dbs = {}
-        self.pagure_changes_dbs = {}
-        self.gitlab_changes_dbs = {}
-
-        def getGerritConnection(driver, name, config):
-            db = self.gerrit_changes_dbs.setdefault(config['server'], {})
-            poll_event = self.poller_events.setdefault(name, threading.Event())
-            ref_event = self.poller_events.setdefault(name + '-ref',
-                                                      threading.Event())
-            con = FakeGerritConnection(driver, name, config,
-                                       changes_db=db,
-                                       upstream_root=self.upstream_root,
-                                       poller_event=poll_event,
-                                       ref_watcher_event=ref_event)
-            if con.web_server:
-                self.addCleanup(con.web_server.stop)
-
-            self.additional_event_queues.append(con.event_queue)
-            setattr(self, 'fake_' + name, con)
-            return con
-
-        self.useFixture(fixtures.MonkeyPatch(
-            'zuul.driver.gerrit.GerritDriver.getConnection',
-            getGerritConnection))
-
-        def registerGithubProjects(con):
-            path = self.config.get('scheduler', 'tenant_config')
-            with open(os.path.join(FIXTURE_DIR, path)) as f:
-                tenant_config = yaml.safe_load(f.read())
-            for tenant in tenant_config:
-                sources = tenant['tenant']['source']
-                conf = sources.get(con.source.name)
-                if not conf:
-                    return
-
-                projects = conf.get('config-projects', [])
-                projects.extend(conf.get('untrusted-projects', []))
-
-                client = con.getGithubClient(None)
-                for project in projects:
-                    if isinstance(project, dict):
-                        # This can be a dict with the project as the only key
-                        client.addProjectByName(
-                            list(project.keys())[0])
-                    else:
-                        client.addProjectByName(project)
-
-        def getGithubConnection(driver, name, config):
-            server = config.get('server', 'github.com')
-            db = self.github_changes_dbs.setdefault(server, {})
-            con = FakeGithubConnection(
-                driver, name, config,
-                self.rpcclient,
-                changes_db=db,
-                upstream_root=self.upstream_root,
-                git_url_with_auth=self.git_url_with_auth)
-            self.additional_event_queues.append(con.event_queue)
-            setattr(self, 'fake_' + name, con)
-            registerGithubProjects(con)
-            return con
-
-        self.useFixture(fixtures.MonkeyPatch(
-            'zuul.driver.github.GithubDriver.getConnection',
-            getGithubConnection))
-
-        def getPagureConnection(driver, name, config):
-            server = config.get('server', 'pagure.io')
-            db = self.pagure_changes_dbs.setdefault(server, {})
-            con = FakePagureConnection(
-                driver, name, config,
-                self.rpcclient,
-                changes_db=db,
-                upstream_root=self.upstream_root)
-            self.additional_event_queues.append(con.event_queue)
-            setattr(self, 'fake_' + name, con)
-            return con
-
-        self.useFixture(fixtures.MonkeyPatch(
-            'zuul.driver.pagure.PagureDriver.getConnection',
-            getPagureConnection))
-
-        def getGitlabConnection(driver, name, config):
-            server = config.get('server', 'gitlab.com')
-            db = self.gitlab_changes_dbs.setdefault(server, {})
-            con = FakeGitlabConnection(
-                driver, name, config,
-                self.rpcclient,
-                changes_db=db,
-                upstream_root=self.upstream_root)
-            self.additional_event_queues.append(con.event_queue)
-            setattr(self, 'fake_' + name, con)
-            return con
-
-        self.useFixture(fixtures.MonkeyPatch(
-            'zuul.driver.gitlab.GitlabDriver.getConnection',
-            getGitlabConnection))
-
         # Set up smtp related fakes
         # TODO(jhesketh): This should come from lib.connections for better
         # coverage
@@ -4065,6 +4185,7 @@ class ZuulTestCase(BaseTestCase):
 
         self.useFixture(fixtures.MonkeyPatch('smtplib.SMTP', FakeSMTPFactory))
 
+    def _configureMqtt(self):
         # Set up mqtt related fakes
         self.mqtt_messages = []
 
@@ -4076,10 +4197,6 @@ class ZuulTestCase(BaseTestCase):
             'zuul.driver.mqtt.mqttconnection.MQTTConnection.publish',
             fakeMQTTPublish))
 
-        # Register connections from the config using fakes
-        self.connections = zuul.lib.connections.ConnectionRegistry()
-        self.connections.configure(self.config, source_only=source_only)
-
     def setup_config(self, config_file: str):
         # This creates the per-test configuration object.  It can be
         # overridden by subclasses, but should not need to be since it
@@ -4343,6 +4460,7 @@ class ZuulTestCase(BaseTestCase):
         if self.merge_server:
             self.merge_server.stop()
             self.merge_server.join()
+
         self.executor_server.stop()
         self.executor_server.join()
         self.scheds.execute(lambda app: app.sched.stop())
@@ -4373,9 +4491,12 @@ class ZuulTestCase(BaseTestCase):
                    and not t.name.startswith('ptvsd.')
                    ]
         if len(threads) > 1:
+            thread_map = dict(map(lambda x: (x.ident, x.name),
+                                  threading.enumerate()))
             log_str = ""
             for thread_id, stack_frame in sys._current_frames().items():
-                log_str += "Thread: %s\n" % thread_id
+                log_str += "Thread id: %s, name: %s\n" % (
+                    thread_id, thread_map.get(thread_id, 'UNKNOWN'))
                 log_str += "".join(traceback.format_stack(stack_frame))
             self.log.debug(log_str)
             raise Exception("More than one thread is running: %s" % threads)
@@ -4580,8 +4701,7 @@ class ZuulTestCase(BaseTestCase):
                 return False
         return True
 
-    def __eventQueuesEmpty(self, matcher)\
+    def __eventQueuesEmpty(self, matcher) -> Generator[bool, None, None]:
-            -> Generator[bool, None, None]:
         for event_queue in self.__event_queues(matcher):
             yield event_queue.empty()
 
@@ -4606,10 +4726,14 @@ class ZuulTestCase(BaseTestCase):
                                    (event_queue, event_queue.empty()))
                 self.log.error("All builds waiting: %s" %
                                (self.__areAllBuildsWaiting(matcher),))
+                self.log.error("All merge jobs waiting: %s" %
+                               (self.__areAllMergeJobsWaiting(matcher),))
                 self.log.error("All builds reported: %s" %
                                (self.__haveAllBuildsReported(matcher),))
                 self.log.error("All requests completed: %s" %
                                (self.__areAllNodeRequestsComplete(matcher),))
+                self.log.error("All event queues empty: %s" %
+                               (all(self.__eventQueuesEmpty(matcher)),))
                 for app in self.scheds.filter(matcher):
                     self.log.error("[Sched: %s] Merge client jobs: %s" %
                                    (app.sched, app.sched.merger.jobs,))
@@ -5048,8 +5172,8 @@ class ZuulTestCase(BaseTestCase):
         :arg str event: The JSON-encoded event.
 
         """
-        specified_conn = self.connections.connections[connection]
+        specified_conn = self.scheds.first.connections.connections[connection]
-        for conn in self.connections.connections.values():
+        for conn in self.scheds.first.connections.connections.values():
             if (isinstance(conn, specified_conn.__class__) and
                 specified_conn.server == conn.server):
                 conn.addEvent(event)

tests/unit/test_connection.py

@@ -65,7 +65,7 @@ class TestSQLConnection(ZuulDBTestCase):
     expected_table_prefix = ''
 
     def _sql_tables_created(self, connection_name):
-        connection = self.connections.connections[connection_name]
+        connection = self.scheds.first.connections.connections[connection_name]
         insp = sa.engine.reflection.Inspector(connection.engine)
 
         table_prefix = connection.table_prefix
@@ -83,7 +83,7 @@ class TestSQLConnection(ZuulDBTestCase):
         self._sql_tables_created('resultsdb_postgresql')
 
     def _sql_indexes_created(self, connection_name):
-        connection = self.connections.connections[connection_name]
+        connection = self.scheds.first.connections.connections[connection_name]
         insp = sa.engine.reflection.Inspector(connection.engine)
 
         table_prefix = connection.table_prefix
@@ -128,8 +128,8 @@ class TestSQLConnection(ZuulDBTestCase):
                 connection_name
             )
 
-            conn = self.connections.connections[
+            conn = self.scheds.first.connections.connections[connection_name].\
-                connection_name].engine.connect()
+                engine.connect()
             result = conn.execute(
                 sa.sql.select([reporter.connection.zuul_buildset_table]))
 
@@ -238,8 +238,8 @@ class TestSQLConnection(ZuulDBTestCase):
                 connection_name
             )
 
-            with self.connections.connections[
+            with self.scheds.first.connections.connections[connection_name]\
-                connection_name].engine.connect() as conn:
+                    .engine.connect() as conn:
 
                 result = conn.execute(
                     sa.sql.select([reporter.connection.zuul_buildset_table])
@@ -328,8 +328,8 @@ class TestSQLConnection(ZuulDBTestCase):
                 connection_name_1
             )
 
-            conn = self.connections.connections[connection_name_1].\
+            conn = self.scheds.first.connections.\
-                engine.connect()
+                connections[connection_name_1].engine.connect()
             buildsets_resultsdb = conn.execute(sa.sql.select(
                 [reporter1.connection.zuul_buildset_table])).fetchall()
             # Should have been 2 buildset reported to the resultsdb (both
@@ -352,8 +352,8 @@ class TestSQLConnection(ZuulDBTestCase):
                 connection_name_2
             )
 
-            conn = self.connections.connections[connection_name_2].\
+            conn = self.scheds.first.connections.\
-                engine.connect()
+                connections[connection_name_2].engine.connect()
             buildsets_resultsdb_failures = conn.execute(sa.sql.select(
                 [reporter2.connection.zuul_buildset_table])).fetchall()
             # The failure db should only have 1 buildset failed
@@ -490,19 +490,17 @@ class TestMultipleGerrits(ZuulTestCase):
 class TestConnectionsMerger(ZuulTestCase):
     config_file = 'zuul-connections-merger.conf'
     tenant_config_file = 'config/single-tenant/main.yaml'
-
+    source_only = True
-    def configure_connections(self):
-        super(TestConnectionsMerger, self).configure_connections(True)
 
     def test_connections_merger(self):
         "Test merger only configures source connections"
 
-        self.assertIn("gerrit", self.connections.connections)
+        self.assertIn("gerrit", self.scheds.first.connections.connections)
-        self.assertIn("github", self.connections.connections)
+        self.assertIn("github", self.scheds.first.connections.connections)
-        self.assertNotIn("smtp", self.connections.connections)
+        self.assertNotIn("smtp", self.scheds.first.connections.connections)
-        self.assertNotIn("sql", self.connections.connections)
+        self.assertNotIn("sql", self.scheds.first.connections.connections)
-        self.assertNotIn("timer", self.connections.connections)
+        self.assertNotIn("timer", self.scheds.first.connections.connections)
-        self.assertNotIn("zuul", self.connections.connections)
+        self.assertNotIn("zuul", self.scheds.first.connections.connections)
 
 
 class TestConnectionsCgit(ZuulTestCase):
@@ -510,8 +508,8 @@ class TestConnectionsCgit(ZuulTestCase):
     tenant_config_file = 'config/single-tenant/main.yaml'
 
     def test_cgit_web_url(self):
-        self.assertIn("gerrit", self.connections.connections)
+        self.assertIn("gerrit", self.scheds.first.connections.connections)
-        conn = self.connections.connections['gerrit']
+        conn = self.scheds.first.connections.connections['gerrit']
         source = conn.source
         proj = source.getProject('foo/bar')
         url = conn._getWebUrl(proj, '1')
@@ -524,8 +522,8 @@ class TestConnectionsGitweb(ZuulTestCase):
     tenant_config_file = 'config/single-tenant/main.yaml'
 
     def test_gitweb_url(self):
-        self.assertIn("gerrit", self.connections.connections)
+        self.assertIn("gerrit", self.scheds.first.connections.connections)
-        conn = self.connections.connections['gerrit']
+        conn = self.scheds.first.connections.connections['gerrit']
         source = conn.source
         proj = source.getProject('foo/bar')
         url = conn._getWebUrl(proj, '1')

tests/unit/test_cross_crd.py

@@ -55,7 +55,7 @@ class TestGerritToGithubCRD(ZuulTestCase):
         self.assertEqual(A.data['status'], 'NEW')
         self.assertFalse(B.is_merged)
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         self.executor_server.hold_jobs_in_build = True
@@ -517,7 +517,7 @@ class TestGithubToGerritCRD(ZuulTestCase):
         self.assertFalse(A.is_merged)
         self.assertEqual(B.data['status'], 'NEW')
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         self.executor_server.hold_jobs_in_build = True

tests/unit/test_gerrit_crd.py

@@ -72,7 +72,7 @@ class TestGerritCRD(ZuulTestCase):
         self.assertEqual(A.data['status'], 'NEW')
         self.assertEqual(B.data['status'], 'NEW')
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         self.executor_server.hold_jobs_in_build = True

tests/unit/test_gerrit_legacy_crd.py

@@ -60,7 +60,7 @@ class TestGerritLegacyCRD(ZuulTestCase):
         self.assertEqual(A.data['status'], 'NEW')
         self.assertEqual(B.data['status'], 'NEW')
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         self.executor_server.hold_jobs_in_build = True

tests/unit/test_github_driver.py

@@ -1611,8 +1611,11 @@ class TestGithubWebhook(ZuulTestCase):
 
         # Start the web server
         self.web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
         host = '127.0.0.1'
         # Wait until web server is started

tests/unit/test_gitlab_driver.py

@@ -34,8 +34,11 @@ class TestGitlabWebhook(ZuulTestCase):
 
         # Start the web server
         self.web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
         host = '127.0.0.1'
         # Wait until web server is started

tests/unit/test_pagure_driver.py

@@ -754,7 +754,7 @@ class TestPagureToGerritCRD(ZuulTestCase):
         self.assertFalse(A.is_merged)
         self.assertEqual(B.data['status'], 'NEW')
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         B.addApproval('Approved', 1)
@@ -839,7 +839,7 @@ class TestGerritToPagureCRD(ZuulTestCase):
         self.assertEqual(A.data['status'], 'NEW')
         self.assertFalse(B.is_merged)
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         B.addFlag('success', 'https://url', 'Build passed')
@@ -916,7 +916,7 @@ class TestPagureToGithubCRD(ZuulTestCase):
         self.assertFalse(A.is_merged)
         self.assertFalse(B.is_merged)
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         B.addLabel('approved')
@@ -985,7 +985,7 @@ class TestGithubToPagureCRD(ZuulTestCase):
         self.assertFalse(A.is_merged)
         self.assertFalse(B.is_merged)
 
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         B.addFlag('success', 'https://url', 'Build passed')
@@ -1044,8 +1044,11 @@ class TestPagureWebhook(ZuulTestCase):
         super(TestPagureWebhook, self).setUp()
         # Start the web server
         self.web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
         host = '127.0.0.1'
         # Wait until web server is started
@@ -1089,8 +1092,11 @@ class TestPagureWebhookWhitelist(ZuulTestCase):
         super(TestPagureWebhookWhitelist, self).setUp()
         # Start the web server
         self.web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
         host = '127.0.0.1'
         # Wait until web server is started

tests/unit/test_scheduler.py

@@ -1140,7 +1140,7 @@ class TestScheduler(ZuulTestCase):
         # triggering events.  Since it will have the changes cached
         # already (without approvals), we need to clear the cache
         # first.
-        for connection in self.connections.connections.values():
+        for connection in self.scheds.first.connections.connections.values():
             connection.maintainCache([])
 
         self.executor_server.hold_jobs_in_build = True

tests/unit/test_streaming.py

@@ -250,8 +250,11 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
         '''
         # Start the web server
         web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
         # Start the finger streamer daemon
         streamer = zuul.lib.log_streamer.LogStreamer(
@@ -326,8 +329,11 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
     def test_websocket_streaming(self):
         # Start the web server
         web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
         # Start the finger streamer daemon
         streamer = zuul.lib.log_streamer.LogStreamer(
@@ -399,8 +405,11 @@ class TestStreaming(tests.base.AnsibleZuulTestCase):
     def test_websocket_hangup(self):
         # Start the web server
         web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
         # Start the finger streamer daemon
         streamer = zuul.lib.log_streamer.LogStreamer(

tests/unit/test_web.py

@@ -55,12 +55,14 @@ class BaseTestWeb(ZuulTestCase):
         self.zuul_ini_config = FakeConfig(self.config_ini_data)
         # Start the web server
         self.web = self.useFixture(
-            ZuulWebFixture(
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                self.gearman_server.port,
+                           self.additional_event_queues, self.upstream_root,
-                self.config,
+                           self.rpcclient, self.poller_events,
-                self.test_root,
+                           self.git_url_with_auth, self.addCleanup,
-                info=zuul.model.WebInfo.fromConfig(self.zuul_ini_config),
+                           self.test_root,
-                zk_hosts=self.zk_config))
+                           info=zuul.model.WebInfo.fromConfig(
+                               self.zuul_ini_config),
+                           zk_hosts=self.zk_config))
 
         self.executor_server.hold_jobs_in_build = True
 

tests/unit/test_web_urls.py

@@ -27,8 +27,11 @@ class TestWebURLs(ZuulTestCase):
     def setUp(self):
         super(TestWebURLs, self).setUp()
         self.web = self.useFixture(
-            ZuulWebFixture(self.gearman_server.port,
+            ZuulWebFixture(self.gearman_server.port, self.changes, self.config,
-                           self.config, self.test_root))
+                           self.additional_event_queues, self.upstream_root,
+                           self.rpcclient, self.poller_events,
+                           self.git_url_with_auth, self.addCleanup,
+                           self.test_root))
 
     def _get(self, port, uri):
         url = "http://localhost:{}{}".format(port, uri)

zuul/driver/git/gitconnection.py

@@ -35,6 +35,7 @@ class GitConnection(BaseConnection):
         if 'baseurl' not in self.connection_config:
             raise Exception('baseurl is required for git connections in '
                             '%s' % self.connection_name)
+        self.watcher_thread = None
         self.baseurl = self.connection_config.get('baseurl')
         self.poll_timeout = float(
             self.connection_config.get('poll_delay', 3600 * 2))

zuul/executor/server.py

@@ -2770,6 +2770,7 @@ class ExecutorServer(BaseMergeServer):
 
     def stop(self):
         self.log.debug("Stopping")
+        self.connections.stop()
         self.disk_accountant.stop()
         # The governor can change function registration, so make sure
         # it has stopped.