From f2fc21cc0a3e79f48684b32ac1b2bf7fa0339af0 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Mon, 12 Aug 2019 12:39:12 -0700 Subject: [PATCH] Split methods --- appengine/flexible/tasks/snippets.py | 24 ++++++++++++++++++++--- appengine/flexible/tasks/snippets_test.py | 22 ++++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/appengine/flexible/tasks/snippets.py b/appengine/flexible/tasks/snippets.py index 3a5aacade1f..9f4183197da 100644 --- a/appengine/flexible/tasks/snippets.py +++ b/appengine/flexible/tasks/snippets.py @@ -176,26 +176,44 @@ def create_task_with_name(project, location, queue, task_name): def delete_task(project, location, queue): - # [START taskqueues_setup] + # [START taskqueues_deleting_tasks] client = tasks.CloudTasksClient() # TODO(developer): Uncomment these lines and replace with your values. # project = 'my-project-id' # location = 'us- central1' # queue = 'queue1' - # [END taskqueues_setup] - # [START taskqueues_deleting_tasks] task_path = client.task_path(project, location, queue, 'foo') response = client.delete_task(task_path) # [END taskqueues_deleting_tasks] + return response + +def purge_queue(project, location, queue): # [START taskqueues_purging_tasks] + client = tasks.CloudTasksClient() + + # TODO(developer): Uncomment these lines and replace with your values. + # project = 'my-project-id' + # location = 'us- central1' + # queue = 'queue1' + queue_path = client.queue_path(project, location, queue) response = client.purge_queue(queue_path) # [END taskqueues_purging_tasks] + return response + +def pause_queue(project, location, queue): # [START taskqueues_pause_queue] + client = tasks.CloudTasksClient() + + # TODO(developer): Uncomment these lines and replace with your values. + # project = 'my-project-id' + # location = 'us- central1' + # queue = 'queue1' + queue_path = client.queue_path(project, location, queue) response = client.pause_queue(queue_path) # [END taskqueues_pause_queues] diff --git a/appengine/flexible/tasks/snippets_test.py b/appengine/flexible/tasks/snippets_test.py index 8923c670ea6..73ff52bdc88 100644 --- a/appengine/flexible/tasks/snippets_test.py +++ b/appengine/flexible/tasks/snippets_test.py @@ -71,14 +71,30 @@ def test_create_task_with_name(): @pytest.mark.order6 def test_delete_task(): + result = snippets.delete_task( + TEST_PROJECT_ID, TEST_LOCATION, QUEUE_NAME_1) + assert result is None + + +@pytest.mark.order7 +def test_purge_queue(): name = "projects/{}/locations/{}/queues/{}".format( TEST_PROJECT_ID, TEST_LOCATION, QUEUE_NAME_1) - result = snippets.delete_task( + result = snippets.purge_queue( TEST_PROJECT_ID, TEST_LOCATION, QUEUE_NAME_1) assert name in result.name -@pytest.mark.order7 +@pytest.mark.order8 +def test_pause_queue(): + name = "projects/{}/locations/{}/queues/{}".format( + TEST_PROJECT_ID, TEST_LOCATION, QUEUE_NAME_1) + result = snippets.pause_queue( + TEST_PROJECT_ID, TEST_LOCATION, QUEUE_NAME_1) + assert name in result.name + + +@pytest.mark.order9 def test_delete_queue(): result = snippets.delete_queue( TEST_PROJECT_ID, TEST_LOCATION, QUEUE_NAME_1) @@ -89,7 +105,7 @@ def test_delete_queue(): assert result is None -@pytest.mark.order8 +@pytest.mark.order10 def test_retry_task(): QUEUE_SIZE = 3 QUEUE_NAME = []