Re-enable test_connection tests

Re-enable the TestGerritConnection and TestConnections test cases.

Change-Id: I23c12b23546102212990b2dca7369741efa990b6
changes/49/351949/4
Morgan Fainberg 6 years ago committed by James E. Blair
parent a5dba23e77
commit 4245a42cf0
  1. 26
      tests/fixtures/config/zuul-connections-same-gerrit/git/common-config/zuul.yaml
  2. 1
      tests/fixtures/config/zuul-connections-same-gerrit/git/org_project/README
  3. 8
      tests/fixtures/config/zuul-connections-same-gerrit/main.yaml
  4. 2
      tests/fixtures/zuul-connections-same-gerrit.conf
  5. 10
      tests/test_connection.py
  6. 4
      zuul/model.py

@ -0,0 +1,26 @@
- pipeline:
name: check
manager: independent
source: review_gerrit
trigger:
review_gerrit:
- event: patchset-created
success:
review_gerrit:
verified: 1
failure:
alt_voting_gerrit:
verified: -1
- job:
name: project-test1
- job:
name: project-test2
- project:
name: org/project
check:
jobs:
- project-test1
- project-test2

@ -0,0 +1,8 @@
- tenant:
name: tenant-one
source:
review_gerrit:
config-repos:
- common-config
project-repos:
- org/project

@ -2,7 +2,7 @@
server=127.0.0.1
[zuul]
layout_config=layout-connections-multiple-voters.yaml
tenant_config=config/zuul-connections-same-gerrit/main.yaml
url_pattern=http://logs.example.com/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}
job_name_in_report=true

@ -21,9 +21,6 @@ from tests.base import ZuulTestCase
class TestGerritConnection(testtools.TestCase):
def setUp(self):
self.skip("Disabled for early v3 development")
log = logging.getLogger("zuul.test_connection")
def test_driver_name(self):
@ -32,11 +29,8 @@ class TestGerritConnection(testtools.TestCase):
class TestConnections(ZuulTestCase):
def setUp(self):
self.skip("Disabled for early v3 development")
def setup_config(self, config_file='zuul-connections-same-gerrit.conf'):
super(TestConnections, self).setup_config(config_file)
config_file = 'zuul-connections-same-gerrit.conf'
tenant_config_file = 'config/zuul-connections-same-gerrit/main.yaml'
def test_multiple_connections(self):
"Test multiple connections to the one gerrit"

@ -1617,9 +1617,9 @@ class UnparsedTenantConfig(object):
elif key == 'pipeline':
self.pipelines.append(value)
else:
raise Exception("Configuration item not recognized "
raise Exception("Configuration item `%s` not recognized "
"(when parsing %s)" %
(conf,))
(item, conf,))
class Layout(object):

Loading…
Cancel
Save