Re-enable test_timer
Builds on past refactors so pretty straight forward refactor of the
test.
Change-Id: Ie4ad9be3180eb41e4b292aebb70d26c35e87ba34
Story: 2000773
Task: 3474
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-bitrot-stable-old.yaml b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-bitrot-stable-old.yaml
new file mode 100644
index 0000000..f679dce
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-bitrot-stable-old.yaml
@@ -0,0 +1,2 @@
+- hosts: all
+ tasks: []
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-bitrot-stable-older.yaml b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-bitrot-stable-older.yaml
new file mode 100644
index 0000000..f679dce
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-bitrot-stable-older.yaml
@@ -0,0 +1,2 @@
+- hosts: all
+ tasks: []
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-test1.yaml b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-test1.yaml
new file mode 100644
index 0000000..f679dce
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-test1.yaml
@@ -0,0 +1,2 @@
+- hosts: all
+ tasks: []
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-test2.yaml b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-test2.yaml
new file mode 100644
index 0000000..f679dce
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer/playbooks/project-test2.yaml
@@ -0,0 +1,2 @@
+- hosts: all
+ tasks: []
diff --git a/tests/fixtures/config/single-tenant/git/layout-timer/zuul.yaml b/tests/fixtures/config/single-tenant/git/layout-timer/zuul.yaml
new file mode 100644
index 0000000..f69a91d
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/layout-timer/zuul.yaml
@@ -0,0 +1,52 @@
+- pipeline:
+ name: check
+ manager: independent
+ source:
+ gerrit
+ trigger:
+ gerrit:
+ - event: patchset-created
+ success:
+ gerrit:
+ verified: 1
+ failure:
+ gerrit:
+ verified: -1
+
+- pipeline:
+ name: periodic
+ manager: independent
+ source:
+ gerrit
+ trigger:
+ timer:
+ - time: '* * * * * */1'
+
+- job:
+ name: project-test1
+
+- job:
+ name: project-test2
+
+- job:
+ name: project-bitrot-stable-old
+ nodes:
+ - name: static
+ image: ubuntu-xenial
+
+- job:
+ name: project-bitrot-stable-older
+ nodes:
+ - name: static
+ image: ubuntu-trusty
+
+- project:
+ name: org/project
+ check:
+ jobs:
+ - project-test1
+ - project-test2
+ periodic:
+ jobs:
+ - project-bitrot-stable-old
+ - project-bitrot-stable-older
diff --git a/tests/fixtures/layout-timer.yaml b/tests/fixtures/layout-timer.yaml
deleted file mode 100644
index 4904f87..0000000
--- a/tests/fixtures/layout-timer.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-pipelines:
- - name: check
- manager: IndependentPipelineManager
- trigger:
- gerrit:
- - event: patchset-created
- success:
- gerrit:
- verified: 1
- failure:
- gerrit:
- verified: -1
-
- - name: periodic
- manager: IndependentPipelineManager
- trigger:
- timer:
- - time: '* * * * * */1'
-
-projects:
- - name: org/project
- check:
- - project-merge:
- - project-test1
- - project-test2
- periodic:
- - project-bitrot-stable-old
- - project-bitrot-stable-older
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index ec50798..7d48e4d 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -2768,14 +2768,11 @@
self.assertEqual(results.get(build.name, ''),
build.parameters.get('BUILD_TAGS'))
- @skip("Disabled for early v3 development")
def test_timer(self):
"Test that a periodic job is triggered"
self.launch_server.hold_jobs_in_build = True
- self.updateConfigLayout(
- 'tests/fixtures/layout-timer.yaml')
+ self.updateConfigLayout('layout-timer')
self.sched.reconfigure(self.config)
- self.registerJobs()
# The pipeline triggers every second, so we should have seen
# several by now.
@@ -2786,17 +2783,16 @@
port = self.webapp.server.socket.getsockname()[1]
- req = urllib.request.Request("http://localhost:%s/status.json" % port)
+ req = urllib.request.Request(
+ "http://localhost:%s/openstack/status" % port)
f = urllib.request.urlopen(req)
data = f.read()
self.launch_server.hold_jobs_in_build = False
# Stop queuing timer triggered jobs so that the assertions
# below don't race against more jobs being queued.
- self.updateConfigLayout(
- 'tests/fixtures/layout-no-timer.yaml')
+ self.commitLayoutUpdate('layout-timer', 'layout-no-timer')
self.sched.reconfigure(self.config)
- self.registerJobs()
self.launch_server.release()
self.waitUntilSettled()