From f11a8ecd409f280759af7227db52b1e87e389092 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 19 Apr 2018 22:31:01 +0300 Subject: Change: trigger a project, build all pipelines in the project --- ick2/workapi_tests.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'ick2/workapi_tests.py') diff --git a/ick2/workapi_tests.py b/ick2/workapi_tests.py index 1ee4625..92d34e5 100644 --- a/ick2/workapi_tests.py +++ b/ick2/workapi_tests.py @@ -75,7 +75,7 @@ class WorkAPITests(unittest.TestCase): def test_worker_gets_work_when_a_pipeline_is_triggered(self): projects = self.create_project_api() - projects.set_pipeline('triggered', 'foo', 'build') + projects.set_status('foo', 'triggered') self.create_worker_api() work = self.create_work_api() expected = { @@ -83,7 +83,6 @@ class WorkAPITests(unittest.TestCase): 'build_number': 1, 'worker': 'asterix', 'project': 'foo', - 'pipeline': 'build', 'parameters': { 'foo': 'bar', }, @@ -99,7 +98,7 @@ class WorkAPITests(unittest.TestCase): def test_worker_manager_posts_work_updates(self): projects = self.create_project_api() - projects.set_pipeline('triggered', 'foo', 'build') + projects.set_status('foo', 'triggered') self.create_worker_api() work = self.create_work_api() @@ -109,7 +108,6 @@ class WorkAPITests(unittest.TestCase): 'build_number': 1, 'worker': 'asterix', 'project': 'foo', - 'pipeline': 'build', 'parameters': { 'foo': 'bar', }, @@ -125,7 +123,6 @@ class WorkAPITests(unittest.TestCase): 'build_id': 'foo/1', 'worker': 'asterix', 'project': 'foo', - 'pipeline': 'build', 'exit_code': None, 'stdout': 'out', 'stderr': 'err', @@ -162,12 +159,12 @@ class WorkAPITests(unittest.TestCase): # An pipeline status has changed. self.assertEqual( - projects.get_pipeline('foo', 'build'), + projects.get_status('foo'), {'status': 'idle'}) def test_worker_manager_posts_failure(self): projects = self.create_project_api() - projects.set_pipeline('triggered', 'foo', 'build') + projects.set_status('foo', 'triggered') self.create_worker_api() work = self.create_work_api() @@ -177,7 +174,6 @@ class WorkAPITests(unittest.TestCase): 'build_number': 1, 'worker': 'asterix', 'project': 'foo', - 'pipeline': 'build', 'parameters': { 'foo': 'bar', }, @@ -193,7 +189,6 @@ class WorkAPITests(unittest.TestCase): 'build_id': 'foo/1', 'worker': 'asterix', 'project': 'foo', - 'pipeline': 'build', 'exit_code': 1, 'stdout': 'out', 'stderr': 'err', @@ -204,7 +199,7 @@ class WorkAPITests(unittest.TestCase): # Ask for work again. self.assertEqual(work.get_work('asterix'), {}) - # An pipeline status has changed. + # And project status has changed. self.assertEqual( - projects.get_pipeline('foo', 'build'), + projects.get_status('foo'), {'status': 'idle'}) -- cgit v1.2.1