Re-enable test_timer_smtp
Simple refactor from v2->v3
Change-Id: Id80874a31a0e469a5c834bddd66e17c6f891825c
Story: 2000773
Task: 3475
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer-smtp/playbooks/project-bitrot-stable-old.yaml b/tests/fixtures/config/single-tenant/git/layout-timer-smtp/playbooks/project-bitrot-stable-old.yaml
new file mode 100644
index 0000000..f679dce
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer-smtp/playbooks/project-bitrot-stable-old.yaml
@@ -0,0 +1,2 @@
+- hosts: all
+ tasks: []
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer-smtp/playbooks/project-bitrot-stable-older.yaml b/tests/fixtures/config/single-tenant/git/layout-timer-smtp/playbooks/project-bitrot-stable-older.yaml
new file mode 100644
index 0000000..f679dce
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer-smtp/playbooks/project-bitrot-stable-older.yaml
@@ -0,0 +1,2 @@
+- hosts: all
+ tasks: []
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer-smtp/zuul.yaml b/tests/fixtures/config/single-tenant/git/layout-timer-smtp/zuul.yaml
new file mode 100644
index 0000000..4a14107
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer-smtp/zuul.yaml
@@ -0,0 +1,28 @@
+- pipeline:
+ name: periodic
+ manager: independent
+ source:
+ gerrit
+ trigger:
+ timer:
+ - time: '* * * * * */1'
+ success:
+ smtp:
+ to: alternative_me@example.com
+ from: zuul_from@example.com
+ subject: 'Periodic check for {change.project} succeeded'
+
+- job:
+ name: project-bitrot-stable-old
+ success-url: http://logs.example.com/{job.name}/{build.number}
+
+- job:
+ name: project-bitrot-stable-older
+ success-url: http://logs.example.com/{job.name}/{build.number}
+
+- project:
+ name: org/project
+ periodic:
+ jobs:
+ - project-bitrot-stable-old
+ - project-bitrot-stable-older
diff --git a/tests/fixtures/layout-timer-smtp.yaml b/tests/fixtures/layout-timer-smtp.yaml
deleted file mode 100644
index b5a6ce0..0000000
--- a/tests/fixtures/layout-timer-smtp.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-pipelines:
- - name: periodic
- manager: IndependentPipelineManager
- trigger:
- timer:
- - time: '* * * * * */1'
- success:
- smtp:
- to: alternative_me@example.com
- from: zuul_from@example.com
- subject: 'Periodic check for {change.project} succeeded'
-
-jobs:
- - name: project-bitrot-stable-old
- success-pattern: http://logs.example.com/{job.name}/{build.number}
- - name: project-bitrot-stable-older
- success-pattern: http://logs.example.com/{job.name}/{build.number}
-
-projects:
- - name: org/project
- periodic:
- - project-bitrot-stable-old
- - project-bitrot-stable-older
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 07d832f..c787f73 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -2876,14 +2876,11 @@
self.assertEqual(A.messages[0],
self.smtp_messages[1]['body'])
- @skip("Disabled for early v3 development")
def test_timer_smtp(self):
"Test that a periodic job is triggered"
self.launch_server.hold_jobs_in_build = True
- self.updateConfigLayout(
- 'tests/fixtures/layout-timer-smtp.yaml')
+ self.updateConfigLayout('layout-timer-smtp')
self.sched.reconfigure(self.config)
- self.registerJobs()
# The pipeline triggers every second, so we should have seen
# several by now.
@@ -2915,10 +2912,8 @@
# Stop queuing timer triggered jobs and let any that may have
# queued through so that end of test assertions pass.
- self.updateConfigLayout(
- 'tests/fixtures/layout-no-timer.yaml')
+ self.commitLayoutUpdate('layout-timer-smtp', 'layout-no-timer')
self.sched.reconfigure(self.config)
- self.registerJobs()
self.waitUntilSettled()
self.launch_server.release('.*')
self.waitUntilSettled()