Re-enable test_timer_smtp
Simple refactor from v2->v3
Change-Id: Id80874a31a0e469a5c834bddd66e17c6f891825c
Story: 2000773
Task: 3475
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()