Skip to content

Commit a020121

Browse files
engelkeengelke
authored
fix: longer waits for deferred operations (GoogleCloudPlatform#10761)
1 parent 1b567d0 commit a020121

File tree

6 files changed

+33
-30
lines changed

6 files changed

+33
-30
lines changed

‎appengine/standard_python3/bundled-services/deferred/django/main.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ def increment_counter(request):
4040
# Use default URL and queue name, no task name, execute ASAP.
4141
deferred.defer(do_something_later, my_key, 10)
4242

43-
# Use default URL and queue name, no task name, execute after 10s.
44-
deferred.defer(do_something_later, my_key, 10, _countdown=20)
43+
# Use default URL and queue name, no task name, execute after 1 minute.
44+
deferred.defer(do_something_later, my_key, 10, _countdown=60)
4545

4646
# Providing non-default task queue arguments
47-
deferred.defer(do_something_later, my_key, 10, _url="/custom/path", _countdown=40)
47+
deferred.defer(do_something_later, my_key, 10, _url="/custom/path", _countdown=120)
4848

4949
return HttpResponse("Deferred counter increment.")
5050

‎appengine/standard_python3/bundled-services/deferred/django/main_test.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,29 @@ def test_upload_and_view(version):
9191

9292
# Request counter be incremented
9393
response = requests.get(f"https://{version_hostname}/counter/increment")
94+
assert response.text == "Deferred counter increment."
9495
assert response.status_code == 200
9596

96-
# counter should be 10 almost immediately
97-
time.sleep(10)
97+
# counter should be 10 almost immediately.
98+
time.sleep(40)
9899
response = requests.get(f"https://{version_hostname}/counter/get")
99100
assert response.text == "10"
100101
assert response.status_code == 200
101102

102-
# After 20 seconds, counter should be 20
103-
time.sleep(20)
103+
# After 60 seconds, counter should be 20
104+
time.sleep(60)
104105
response = requests.get(f"https://{version_hostname}/counter/get")
105106
assert response.text == "20"
106107
assert response.status_code == 200
107108

108-
# After 40 seconds, counter should be 30
109-
time.sleep(20)
109+
# After 120 seconds, counter should be 30
110+
time.sleep(60)
110111
response = requests.get(f"https://{version_hostname}/counter/get")
111112
assert response.text == "30"
112113
assert response.status_code == 200
113114

114115
# counter should stay at 30 unless another request to increment it is set
115-
time.sleep(10)
116+
time.sleep(30)
116117
response = requests.get(f"https://{version_hostname}/counter/get")
117118
assert response.text == "30"
118119
assert response.status_code == 200

‎appengine/standard_python3/bundled-services/deferred/flask/main.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ def increment_counter():
4141
# Use default URL and queue name, no task name, execute ASAP.
4242
deferred.defer(do_something_later, my_key, 10)
4343

44-
# Use default URL and queue name, no task name, execute after 10s.
45-
deferred.defer(do_something_later, my_key, 10, _countdown=20)
44+
# Use default URL and queue name, no task name, execute after 1 minute.
45+
deferred.defer(do_something_later, my_key, 10, _countdown=60)
4646

4747
# Providing non-default task queue arguments
48-
deferred.defer(do_something_later, my_key, 10, _url="/custom/path", _countdown=40)
48+
deferred.defer(do_something_later, my_key, 10, _url="/custom/path", _countdown=120)
4949

5050
return "Deferred counter increment."
5151

‎appengine/standard_python3/bundled-services/deferred/flask/main_test.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,29 @@ def test_upload_and_view(version):
9191

9292
# Request counter be incremented
9393
response = requests.get(f"https://{version_hostname}/counter/increment")
94+
assert response.text == "Deferred counter increment."
9495
assert response.status_code == 200
9596

96-
# counter should be 10 almost immediately. ALMOST immediately
97-
time.sleep(10)
97+
# counter should be 10 almost immediately.
98+
time.sleep(40)
9899
response = requests.get(f"https://{version_hostname}/counter/get")
99100
assert response.text == "10"
100101
assert response.status_code == 200
101102

102-
# After 20 seconds, counter should be 20
103-
time.sleep(20)
103+
# After 60 seconds, counter should be 20
104+
time.sleep(60)
104105
response = requests.get(f"https://{version_hostname}/counter/get")
105106
assert response.text == "20"
106107
assert response.status_code == 200
107108

108-
# After 40 seconds, counter should be 30
109-
time.sleep(20)
109+
# After 120 seconds, counter should be 30
110+
time.sleep(60)
110111
response = requests.get(f"https://{version_hostname}/counter/get")
111112
assert response.text == "30"
112113
assert response.status_code == 200
113114

114115
# counter should stay at 30 unless another request to increment it is set
115-
time.sleep(10)
116+
time.sleep(30)
116117
response = requests.get(f"https://{version_hostname}/counter/get")
117118
assert response.text == "30"
118119
assert response.status_code == 200

‎appengine/standard_python3/bundled-services/deferred/wsgi/main.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ def IncrementCounter(environ, start_response):
3737
# Use default URL and queue name, no task name, execute ASAP.
3838
deferred.defer(do_something_later, my_key, 10)
3939

40-
# Use default URL and queue name, no task name, execute after 10s.
41-
deferred.defer(do_something_later, my_key, 10, _countdown=20)
40+
# Use default URL and queue name, no task name, execute after 1 minute.
41+
deferred.defer(do_something_later, my_key, 10, _countdown=60)
4242

4343
# Providing non-default task queue arguments
44-
deferred.defer(do_something_later, my_key, 10, _url="/custom/path", _countdown=40)
44+
deferred.defer(do_something_later, my_key, 10, _url="/custom/path", _countdown=120)
4545

4646
start_response("200 OK", [("Content-Type", "text/html")])
4747
return [b"Deferred counter increment."]

‎appengine/standard_python3/bundled-services/deferred/wsgi/main_test.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,29 @@ def test_upload_and_view(version):
9191

9292
# Request counter be incremented
9393
response = requests.get(f"https://{version_hostname}/counter/increment")
94+
assert response.text == "Deferred counter increment."
9495
assert response.status_code == 200
9596

96-
# counter should be 10 almost immediately. ALMOST immediately
97-
time.sleep(10)
97+
# counter should be 10 almost immediately.
98+
time.sleep(40)
9899
response = requests.get(f"https://{version_hostname}/counter/get")
99100
assert response.text == "10"
100101
assert response.status_code == 200
101102

102-
# After 20 seconds, counter should be 20
103-
time.sleep(20)
103+
# After 60 seconds, counter should be 20
104+
time.sleep(60)
104105
response = requests.get(f"https://{version_hostname}/counter/get")
105106
assert response.text == "20"
106107
assert response.status_code == 200
107108

108-
# After 40 seconds, counter should be 30
109-
time.sleep(20)
109+
# After 120 seconds, counter should be 30
110+
time.sleep(60)
110111
response = requests.get(f"https://{version_hostname}/counter/get")
111112
assert response.text == "30"
112113
assert response.status_code == 200
113114

114115
# counter should stay at 30 unless another request to increment it is set
115-
time.sleep(10)
116+
time.sleep(30)
116117
response = requests.get(f"https://{version_hostname}/counter/get")
117118
assert response.text == "30"
118119
assert response.status_code == 200

0 commit comments

Comments
 (0)