Merge "Add test for builds/ web route"

This commit is contained in:
Zuul 2018-04-11 22:41:47 +00:00 committed by Gerrit Code Review
commit c6d9f4c6bf
4 changed files with 71 additions and 2 deletions

View File

@ -17,6 +17,33 @@
resultsdb_postgresql: null
resultsdb_postgresql_failures: null
- pipeline:
name: gate
manager: dependent
success-message: Build succeeded (gate).
trigger:
gerrit:
- event: comment-added
approval:
- Approved: 1
success:
gerrit:
Verified: 2
submit: true
resultsdb_mysql: null
resultsdb_postgresql: null
failure:
gerrit:
Verified: -2
resultsdb_mysql: null
resultsdb_mysql_failures: null
resultsdb_postgresql: null
resultsdb_postgresql_failures: null
start:
gerrit:
Verified: 0
precedence: high
- job:
name: base
parent: null
@ -52,3 +79,28 @@
# The noop job can have timing quirks
- noop:
dependencies: project-test2
gate:
jobs:
- project-merge
- project-test1:
dependencies: project-merge
- project-test2:
dependencies: project-merge
- project:
name: org/project1
check:
jobs:
- project-merge
- project-test1:
dependencies: project-merge
- project-test2:
dependencies: project-merge
gate:
queue: integrated
jobs:
- project-merge
- project-test1:
dependencies: project-merge
- project-test2:
dependencies: project-merge

View File

@ -0,0 +1 @@
test

View File

@ -6,3 +6,4 @@
- common-config
untrusted-projects:
- org/project
- org/project1

View File

@ -26,7 +26,7 @@ import requests
import zuul.web
from tests.base import ZuulTestCase, FIXTURE_DIR
from tests.base import ZuulTestCase, ZuulDBTestCase, FIXTURE_DIR
class FakeConfig(object):
@ -64,7 +64,8 @@ class BaseTestWeb(ZuulTestCase):
self.web = zuul.web.ZuulWeb(
listen_address='127.0.0.1', listen_port=0,
gear_server='127.0.0.1', gear_port=self.gearman_server.port,
info=zuul.model.WebInfo.fromConfig(self.zuul_ini_config)
info=zuul.model.WebInfo.fromConfig(self.zuul_ini_config),
connections=self.connections.connections.values()
)
loop = asyncio.new_event_loop()
loop.set_debug(True)
@ -329,3 +330,17 @@ class TestGraphiteUrl(TestInfo):
'stats_url': 'https://graphite.example.com',
}
}
class TestBuildInfo(ZuulDBTestCase, BaseTestWeb):
config_file = 'zuul-sql-driver.conf'
tenant_config_file = 'config/sql-driver/main.yaml'
def test_web_list_builds(self):
# Generate some build records in the db.
self.executor_server.hold_jobs_in_build = False
self.executor_server.release()
self.waitUntilSettled()
builds = self.get_url("api/tenant/tenant-one/builds").json()
self.assertEqual(len(builds), 6)