Pass source to project instantiations
So that we can store the canonical hostname. Also use this to
find and store the connection name to keep the initializer signature
small.
Story: 2000953
Change-Id: Ie10f86ff3412016b411bcc511b4d9ad3af163d61
diff --git a/tests/unit/test_gerrit.py b/tests/unit/test_gerrit.py
index 999e55d..a369aff 100644
--- a/tests/unit/test_gerrit.py
+++ b/tests/unit/test_gerrit.py
@@ -22,6 +22,7 @@
import tests.base
from tests.base import BaseTestCase
+from zuul.driver.gerrit import GerritDriver
from zuul.driver.gerrit.gerritconnection import GerritConnection
FIXTURE_DIR = os.path.join(tests.base.FIXTURE_DIR, 'gerrit')
@@ -53,7 +54,8 @@
'user': 'gerrit',
'server': 'localhost',
}
- gerrit = GerritConnection(None, 'review_gerrit', gerrit_config)
+ driver = GerritDriver()
+ gerrit = GerritConnection(driver, 'review_gerrit', gerrit_config)
calls, values = read_fixtures(files)
_ssh_mock.side_effect = values
diff --git a/tests/unit/test_model.py b/tests/unit/test_model.py
index 2167a3b..7d8a058 100644
--- a/tests/unit/test_model.py
+++ b/tests/unit/test_model.py
@@ -27,19 +27,22 @@
from tests.base import BaseTestCase, FIXTURE_DIR
-class FakeSource(object):
- def __init__(self, name):
- self.name = name
+class Dummy(object):
+ def __init__(self, **kw):
+ for k, v in kw.items():
+ setattr(self, k, v)
class TestJob(BaseTestCase):
-
def setUp(self):
super(TestJob, self).setUp()
+ self.connection = Dummy(connection_name='dummy_connection')
+ self.source = Dummy(canonical_hostname='git.example.com',
+ name='dummy_connection', # TODOv3(jeblair): remove
+ connection=self.connection)
self.tenant = model.Tenant('tenant')
self.layout = model.Layout()
- self.project = model.Project('project', 'connection')
- self.source = FakeSource('connection')
+ self.project = model.Project('project', self.source)
self.tenant.addProjectRepo(self.source, self.project)
self.pipeline = model.Pipeline('gate', self.layout)
self.layout.addPipeline(self.pipeline)
@@ -162,7 +165,7 @@
pipeline = model.Pipeline('gate', layout)
layout.addPipeline(pipeline)
queue = model.ChangeQueue(pipeline)
- project = model.Project('project', None)
+ project = model.Project('project', self.source)
base = configloader.JobParser.fromYaml(tenant, layout, {
'_source_context': self.context,
@@ -508,7 +511,7 @@
pipeline = model.Pipeline('gate', layout)
layout.addPipeline(pipeline)
queue = model.ChangeQueue(pipeline)
- project = model.Project('project', None)
+ project = model.Project('project', self.source)
base = configloader.JobParser.fromYaml(tenant, layout, {
'_source_context': self.context,
@@ -554,7 +557,7 @@
def test_job_source_project(self):
tenant = model.Tenant('tenant')
layout = model.Layout()
- base_project = model.Project('base_project', None)
+ base_project = model.Project('base_project', self.source)
base_context = model.SourceContext(base_project, 'master',
'test', True)
@@ -565,7 +568,7 @@
})
layout.addJob(base)
- other_project = model.Project('other_project', None)
+ other_project = model.Project('other_project', self.source)
other_context = model.SourceContext(other_project, 'master',
'test', True)
base2 = configloader.JobParser.fromYaml(tenant, layout, {
@@ -588,7 +591,7 @@
})
self.layout.addJob(job)
- project2 = model.Project('project2', None)
+ project2 = model.Project('project2', self.source)
context2 = model.SourceContext(project2, 'master',
'test', True)