8b0b6310d8
This addresses SqlAlchemy's removed in 2.0 warnings. Now that SqlAlchemy
2.0 has released we can see that we are not compatible yet. A good first
step in adding compatibility is fixing warnings in 1.4.
In particular there are four types of warning we fix here:
1. Using raw strings in conn.execute() calls. We need to use the text()
construct instead.
2. Passing a list of items to select when doing select queries. Instead
we need to pass things as normal posargs.
3. Accessing row result items as if the row is a dict. THis is not
longer possible without first going through the row._mapping system.
Instead we can access items as normal object attributes.
4. You must now use sqlalchemy.inspect() on a connectable to create an
Inspector object rather than instantiating it directly.
Finally we set up alembic's engine creation to run with future 2.0
behavior now that the warnings are cleared up. This appears to have
already been done for the main zuul application.
Change-Id: I5475e39bd93d71cd1106ec6d3a5423ea2dd51859
189 lines
7.3 KiB
Python
189 lines
7.3 KiB
Python
# Copyright 2020 BMW Group
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import sqlalchemy as sa
|
|
|
|
from zuul.model import DequeueEvent
|
|
|
|
from tests.base import ZuulTestCase, simple_layout
|
|
|
|
|
|
class TestReporting(ZuulTestCase):
|
|
tenant_config_file = "config/single-tenant/main.yaml"
|
|
|
|
@simple_layout("layouts/dequeue-reporting.yaml")
|
|
def test_dequeue_reporting(self):
|
|
"""Check that explicitly dequeued items are reported as dequeued"""
|
|
|
|
self.executor_server.hold_jobs_in_build = True
|
|
A = self.fake_gerrit.addFakeChange("org/project", "master", "A")
|
|
A.addApproval("Code-Review", 2)
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
|
self.waitUntilSettled()
|
|
|
|
event = DequeueEvent('tenant-one', 'check',
|
|
'review.example.com', 'org/project',
|
|
change='1,1',
|
|
ref=None, oldrev=None, newrev=None)
|
|
self.scheds.first.sched.pipeline_management_events['tenant-one'][
|
|
'check'].put(event)
|
|
self.waitUntilSettled()
|
|
|
|
tenant = self.scheds.first.sched.abide.tenants.get('tenant-one')
|
|
check_pipeline = tenant.layout.pipelines['check']
|
|
|
|
# A should have been reported two times: start, cancel
|
|
self.assertEqual(2, A.reported)
|
|
self.assertEqual(2, len(A.messages))
|
|
self.assertIn("Build started (check)", A.messages[0])
|
|
self.assertIn("Build canceled (check)", A.messages[1])
|
|
# There shouldn't be any successful items
|
|
self.assertEqual(len(check_pipeline.getAllItems()), 0)
|
|
# But one canceled
|
|
self.assertEqual(self.countJobResults(self.history, "ABORTED"), 1)
|
|
|
|
@simple_layout("layouts/dequeue-reporting.yaml")
|
|
def test_dequeue_reporting_gate_reset(self):
|
|
"""Check that a gate reset is not reported as dequeued"""
|
|
|
|
A = self.fake_gerrit.addFakeChange("org/project", "master", "A")
|
|
B = self.fake_gerrit.addFakeChange("org/project", "master", "B")
|
|
A.addApproval("Code-Review", 2)
|
|
B.addApproval("Code-Review", 2)
|
|
|
|
self.executor_server.failJob("project-test1", A)
|
|
|
|
self.fake_gerrit.addEvent(A.addApproval("Approved", 1))
|
|
self.fake_gerrit.addEvent(B.addApproval("Approved", 1))
|
|
self.waitUntilSettled()
|
|
|
|
# None of the items should be reported as dequeued, only success or
|
|
# failure
|
|
self.assertEqual(A.data["status"], "NEW")
|
|
self.assertEqual(B.data["status"], "MERGED")
|
|
self.assertEqual(A.reported, 2)
|
|
self.assertEqual(B.reported, 2)
|
|
|
|
self.assertIn("Build started (gate)", A.messages[0])
|
|
self.assertIn("Build failed (gate)", A.messages[1])
|
|
self.assertIn("Build started (gate)", B.messages[0])
|
|
self.assertIn("Build succeeded (gate)", B.messages[1])
|
|
|
|
@simple_layout("layouts/dequeue-reporting.yaml")
|
|
def test_dequeue_reporting_supercedes(self):
|
|
"""Test that a superceeded change is reported as dequeued"""
|
|
|
|
self.executor_server.hold_jobs_in_build = True
|
|
|
|
A = self.fake_gerrit.addFakeChange("org/project", "master", "A")
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
|
self.waitUntilSettled()
|
|
|
|
A.addApproval("Code-Review", 2)
|
|
self.fake_gerrit.addEvent(A.addApproval("Approved", 1))
|
|
|
|
self.executor_server.hold_jobs_in_build = False
|
|
self.executor_server.release()
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(4, A.reported)
|
|
|
|
self.assertIn("Build started (check)", A.messages[0])
|
|
self.assertIn("Build canceled (check)", A.messages[1])
|
|
self.assertIn("Build started (gate)", A.messages[2])
|
|
self.assertIn("Build succeeded (gate)", A.messages[3])
|
|
|
|
@simple_layout("layouts/dequeue-reporting.yaml")
|
|
def test_dequeue_reporting_new_patchset(self):
|
|
"Test that change superceeded by a new patchset is reported as deqeued"
|
|
|
|
self.executor_server.hold_jobs_in_build = True
|
|
|
|
A = self.fake_gerrit.addFakeChange("org/project", "master", "A")
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(1, len(self.builds))
|
|
|
|
A.addPatchset()
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
|
|
self.waitUntilSettled()
|
|
|
|
self.executor_server.hold_jobs_in_build = False
|
|
self.executor_server.release()
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(4, A.reported)
|
|
|
|
self.assertIn("Build started (check)", A.messages[0])
|
|
self.assertIn("Build canceled (check)", A.messages[1])
|
|
self.assertIn("Build started (check)", A.messages[2])
|
|
self.assertIn("Build succeeded (check)", A.messages[3])
|
|
|
|
@simple_layout("layouts/no-jobs-reporting.yaml")
|
|
def test_no_jobs_reporting_check(self):
|
|
# Test that we don't report NO_JOBS results
|
|
|
|
self.executor_server.hold_jobs_in_build = True
|
|
A = self.fake_gerrit.addFakeChange("org/project", "master", "A")
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(0, A.reported)
|
|
self.assertHistory([])
|
|
|
|
tenant = self.scheds.first.sched.abide.tenants.get('tenant-one')
|
|
pipeline = tenant.layout.pipelines['check']
|
|
reporter = self.scheds.first.connections.getSqlReporter(
|
|
pipeline)
|
|
with self.scheds.first.connections.getSqlConnection().\
|
|
engine.connect() as conn:
|
|
|
|
result = conn.execute(
|
|
sa.sql.select(reporter.connection.zuul_buildset_table))
|
|
|
|
buildsets = result.fetchall()
|
|
for x in buildsets:
|
|
self.log.debug("Buildset %s", x)
|
|
self.assertEqual(0, len(buildsets))
|
|
|
|
@simple_layout("layouts/no-jobs-reporting.yaml")
|
|
def test_no_jobs_reporting_check_and_gate(self):
|
|
# Test that we don't report NO_JOBS results
|
|
|
|
self.executor_server.hold_jobs_in_build = True
|
|
A = self.fake_gerrit.addFakeChange("org/project", "master", "A")
|
|
A.addApproval("Code-Review", 2)
|
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
|
self.fake_gerrit.addEvent(A.addApproval("Approved", 1))
|
|
self.waitUntilSettled()
|
|
|
|
self.assertEqual(0, A.reported)
|
|
self.assertHistory([])
|
|
|
|
tenant = self.scheds.first.sched.abide.tenants.get('tenant-one')
|
|
pipeline = tenant.layout.pipelines['check']
|
|
reporter = self.scheds.first.connections.getSqlReporter(
|
|
pipeline)
|
|
with self.scheds.first.connections.getSqlConnection().\
|
|
engine.connect() as conn:
|
|
|
|
result = conn.execute(
|
|
sa.sql.select(reporter.connection.zuul_buildset_table))
|
|
|
|
buildsets = result.fetchall()
|
|
for x in buildsets:
|
|
self.log.debug("Buildset %s", x)
|
|
self.assertEqual(0, len(buildsets))
|