Merge "Move tests to use simple_layout" into feature/zuulv3
diff --git a/tests/base.py b/tests/base.py
index 2ad1085..51c53f9 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1341,13 +1341,10 @@
self.init_repo("org/project4")
self.init_repo("org/project5")
self.init_repo("org/project6")
- self.init_repo("org/one-job-project")
- self.init_repo("org/nonvoting-project")
self.init_repo("org/templated-project")
self.init_repo("org/layered-project")
self.init_repo("org/node-project")
self.init_repo("org/conflict-project")
- self.init_repo("org/noop-project")
self.statsd = FakeStatsd()
# note, use 127.0.0.1 rather than localhost to avoid getting ipv6
@@ -2027,13 +2024,10 @@
- org/project4
- org/project5
- org/project6
- - org/one-job-project
- - org/nonvoting-project
- org/templated-project
- org/layered-project
- org/node-project
- - org/conflict-project
- - org/noop-project\n""" % path)
+ - org/conflict-project\n""" % path)
for repo in untrusted_projects:
f.write(" - %s\n" % repo)
diff --git a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-merge.yaml b/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-merge.yaml
deleted file mode 100644
index f679dce..0000000
--- a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-merge.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- hosts: all
- tasks: []
diff --git a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-post.yaml b/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-post.yaml
deleted file mode 100644
index f679dce..0000000
--- a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-post.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- hosts: all
- tasks: []
diff --git a/tests/fixtures/config/one-job-project/git/org_one-job-project/README b/tests/fixtures/config/one-job-project/git/org_one-job-project/README
deleted file mode 100644
index 9daeafb..0000000
--- a/tests/fixtures/config/one-job-project/git/org_one-job-project/README
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/tests/fixtures/config/one-job-project/main.yaml b/tests/fixtures/config/one-job-project/main.yaml
deleted file mode 100644
index d2da316..0000000
--- a/tests/fixtures/config/one-job-project/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- tenant:
- name: tenant-one
- source:
- gerrit:
- config-projects:
- - common-config
- untrusted-projects:
- - org/one-job-project
diff --git a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
index b227632..a7d99df 100644
--- a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
@@ -72,17 +72,6 @@
queue-name: integration
- job:
- name: nonvoting-project-merge
- hold-following-changes: true
-
-- job:
- name: nonvoting-project-test1
-
-- job:
- name: nonvoting-project-test2
- voting: false
-
-- job:
name: project-testfile
files:
- .*-requires
@@ -177,29 +166,3 @@
post:
jobs:
- project-post
-
-- project:
- name: org/noop-project
- check:
- jobs:
- - noop
- gate:
- jobs:
- - noop
-
-- project:
- name: org/nonvoting-project
- check:
- jobs:
- - nonvoting-project-merge
- - nonvoting-project-test1:
- dependencies: nonvoting-project-merge
- - nonvoting-project-test2:
- dependencies: nonvoting-project-merge
- gate:
- jobs:
- - nonvoting-project-merge
- - nonvoting-project-test1:
- dependencies: nonvoting-project-merge
- - nonvoting-project-test2:
- dependencies: nonvoting-project-merge
diff --git a/tests/fixtures/config/single-tenant/main.yaml b/tests/fixtures/config/single-tenant/main.yaml
index 7434232..cb97158 100644
--- a/tests/fixtures/config/single-tenant/main.yaml
+++ b/tests/fixtures/config/single-tenant/main.yaml
@@ -12,10 +12,7 @@
- org/project4
- org/project5
- org/project6
- - org/one-job-project
- - org/nonvoting-project
- org/templated-project
- org/layered-project
- org/node-project
- org/conflict-project
- - org/noop-project
diff --git a/tests/fixtures/layouts/nonvoting-job.yaml b/tests/fixtures/layouts/nonvoting-job.yaml
new file mode 100644
index 0000000..fee5043
--- /dev/null
+++ b/tests/fixtures/layouts/nonvoting-job.yaml
@@ -0,0 +1,41 @@
+- pipeline:
+ name: gate
+ manager: dependent
+ success-message: Build succeeded (gate).
+ trigger:
+ gerrit:
+ - event: comment-added
+ approval:
+ - approved: 1
+ success:
+ gerrit:
+ verified: 2
+ submit: true
+ failure:
+ gerrit:
+ verified: -2
+ start:
+ gerrit:
+ verified: 0
+ precedence: high
+
+- job:
+ name: nonvoting-project-merge
+ hold-following-changes: true
+
+- job:
+ name: nonvoting-project-test1
+
+- job:
+ name: nonvoting-project-test2
+ voting: false
+
+- project:
+ name: org/nonvoting-project
+ gate:
+ jobs:
+ - nonvoting-project-merge
+ - nonvoting-project-test1:
+ dependencies: nonvoting-project-merge
+ - nonvoting-project-test2:
+ dependencies: nonvoting-project-merge
diff --git a/tests/fixtures/layouts/noop-job.yaml b/tests/fixtures/layouts/noop-job.yaml
new file mode 100644
index 0000000..8081216
--- /dev/null
+++ b/tests/fixtures/layouts/noop-job.yaml
@@ -0,0 +1,26 @@
+- pipeline:
+ name: gate
+ manager: dependent
+ success-message: Build succeeded (gate).
+ trigger:
+ gerrit:
+ - event: comment-added
+ approval:
+ - approved: 1
+ success:
+ gerrit:
+ verified: 2
+ submit: true
+ failure:
+ gerrit:
+ verified: -2
+ start:
+ gerrit:
+ verified: 0
+ precedence: high
+
+- project:
+ name: org/noop-project
+ gate:
+ jobs:
+ - noop
diff --git a/tests/fixtures/config/one-job-project/git/common-config/zuul.yaml b/tests/fixtures/layouts/one-job-project.yaml
similarity index 100%
rename from tests/fixtures/config/one-job-project/git/common-config/zuul.yaml
rename to tests/fixtures/layouts/one-job-project.yaml
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index bc84989..f0087a2 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -1307,6 +1307,7 @@
self.assertEqual(B.reported, 2)
self.assertEqual(C.reported, 2)
+ @simple_layout('layouts/nonvoting-job.yaml')
def test_nonvoting_job(self):
"Test that non-voting jobs don't vote."
@@ -1898,6 +1899,7 @@
self.assertEqual(len(self.history), 10)
self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 1)
+ @simple_layout('layouts/noop-job.yaml')
def test_noop_job(self):
"Test that the internal noop job works"
A = self.fake_gerrit.addFakeChange('org/noop-project', 'master', 'A')
@@ -4569,6 +4571,24 @@
# No more messages reported via smtp
self.assertEqual(3, len(self.smtp_messages))
+ @simple_layout('layouts/one-job-project.yaml')
+ def test_one_job_project(self):
+ "Test that queueing works with one job"
+ A = self.fake_gerrit.addFakeChange('org/one-job-project',
+ 'master', 'A')
+ B = self.fake_gerrit.addFakeChange('org/one-job-project',
+ 'master', 'B')
+ A.addApproval('code-review', 2)
+ B.addApproval('code-review', 2)
+ self.fake_gerrit.addEvent(A.addApproval('approved', 1))
+ self.fake_gerrit.addEvent(B.addApproval('approved', 1))
+ self.waitUntilSettled()
+
+ self.assertEqual(A.data['status'], 'MERGED')
+ self.assertEqual(A.reported, 2)
+ self.assertEqual(B.data['status'], 'MERGED')
+ self.assertEqual(B.reported, 2)
+
def test_rerun_on_abort(self):
"Test that if a execute server fails to run a job, it is run again"
@@ -4818,27 +4838,6 @@
self.assertIn('project-test1', A.messages[0])
-class TestSchedulerOneJobProject(ZuulTestCase):
- tenant_config_file = 'config/one-job-project/main.yaml'
-
- def test_one_job_project(self):
- "Test that queueing works with one job"
- A = self.fake_gerrit.addFakeChange('org/one-job-project',
- 'master', 'A')
- B = self.fake_gerrit.addFakeChange('org/one-job-project',
- 'master', 'B')
- A.addApproval('code-review', 2)
- B.addApproval('code-review', 2)
- self.fake_gerrit.addEvent(A.addApproval('approved', 1))
- self.fake_gerrit.addEvent(B.addApproval('approved', 1))
- self.waitUntilSettled()
-
- self.assertEqual(A.data['status'], 'MERGED')
- self.assertEqual(A.reported, 2)
- self.assertEqual(B.data['status'], 'MERGED')
- self.assertEqual(B.reported, 2)
-
-
class TestSchedulerTemplatedProject(ZuulTestCase):
tenant_config_file = 'config/templated-project/main.yaml'