Re-enable test_connection tests

Re-enable the TestGerritConnection and TestConnections test cases.

Change-Id: I23c12b23546102212990b2dca7369741efa990b6

tests/fixtures/config/zuul-connections-same-gerrit/git/common-config/zuul.yaml

@@ -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

tests/fixtures/config/zuul-connections-same-gerrit/git/org_project/README

@@ -0,0 +1 @@
+test

tests/fixtures/config/zuul-connections-same-gerrit/main.yaml

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

tests/fixtures/zuul-connections-same-gerrit.conf

@@ -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
 

tests/test_connection.py

@@ -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"

zuul/model.py

@@ -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):