Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2369)

Unified Diff: appengine/swarming/server/task_result_test.py

Issue 2914803004: Fix non-idempotent task that /poll reaped but returned HTTP 500. (Closed)
Patch Set: Add test case Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « appengine/swarming/server/task_result.py ('k') | appengine/swarming/server/task_scheduler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/swarming/server/task_result_test.py
diff --git a/appengine/swarming/server/task_result_test.py b/appengine/swarming/server/task_result_test.py
index 9e4a15b1268d9d3800bd05a75c16e74a81d7e6aa..433d8b0216ea88d61741282c6072c4e09e218677 100755
--- a/appengine/swarming/server/task_result_test.py
+++ b/appengine/swarming/server/task_result_test.py
@@ -208,7 +208,7 @@ class TaskResultApiTest(TestCase):
'modified_ts': None,
'outputs_ref': None,
'server_versions': ['v1a'],
- 'started_ts': self.now,
+ 'started_ts': None,
'state': task_result.State.RUNNING,
'try_number': 1,
}
@@ -271,7 +271,8 @@ class TaskResultApiTest(TestCase):
to_run.queue_number = None
to_run.put()
run_result = task_result.new_run_result(request, 1, 'localhost', 'abc', {})
- run_result.modified_ts = utils.utcnow()
+ run_result.started_ts = utils.utcnow()
+ run_result.modified_ts = run_result.started_ts
result_summary.set_from_run_result(run_result, request)
ndb.transaction(lambda: ndb.put_multi((result_summary, run_result)))
expected = {
@@ -418,8 +419,9 @@ class TaskResultApiTest(TestCase):
result_summary.modified_ts = utils.utcnow()
ndb.transaction(result_summary.put)
run_result = task_result.new_run_result(request, 1, 'localhost', 'abc', {})
- run_result.completed_ts = utils.utcnow()
- run_result.modified_ts = utils.utcnow()
+ run_result.started_ts = utils.utcnow()
+ run_result.completed_ts = run_result.started_ts
+ run_result.modified_ts = run_result.started_ts
result_summary.set_from_run_result(run_result, request)
ndb.transaction(lambda: ndb.put_multi((run_result, result_summary)))
@@ -436,6 +438,7 @@ class TaskResultApiTest(TestCase):
request = mkreq(_gen_request())
result_summary = task_result.new_result_summary(request)
run_result = task_result.new_run_result(request, 1, 'localhost', 'abc', {})
+ run_result.started_ts = utils.utcnow()
self.assertTrue(result_summary.need_update_from_run_result(run_result))
result_summary.modified_ts = utils.utcnow()
run_result.modified_ts = utils.utcnow()
@@ -451,6 +454,7 @@ class TaskResultApiTest(TestCase):
request = mkreq(_gen_request())
result_summary = task_result.new_result_summary(request)
run_result = task_result.new_run_result(request, 1, 'localhost', 'abc', {})
+ run_result.started_ts = utils.utcnow()
self.assertTrue(result_summary.need_update_from_run_result(run_result))
result_summary.modified_ts = utils.utcnow()
run_result.modified_ts = utils.utcnow()
@@ -474,8 +478,10 @@ class TaskResultApiTest(TestCase):
result_summary = task_result.new_result_summary(request)
run_result_1 = task_result.new_run_result(
request, 1, 'localhost', 'abc', {})
+ run_result_1.started_ts = utils.utcnow()
run_result_2 = task_result.new_run_result(
request, 2, 'localhost', 'abc', {})
+ run_result_2.started_ts = utils.utcnow()
self.assertTrue(result_summary.need_update_from_run_result(run_result_1))
run_result_2.modified_ts = utils.utcnow()
result_summary.modified_ts = utils.utcnow()
@@ -523,8 +529,9 @@ class TaskResultApiTest(TestCase):
run_result.state = task_result.State.TIMED_OUT
run_result.duration = 0.1
run_result.exit_code = -1
- run_result.completed_ts = utils.utcnow()
- run_result.modified_ts = utils.utcnow()
+ run_result.started_ts = utils.utcnow()
+ run_result.completed_ts = run_result.started_ts
+ run_result.modified_ts = run_result.started_ts
result_summary.set_from_run_result(run_result, request)
ndb.transaction(lambda: ndb.put_multi((run_result, result_summary)))
run_result = run_result.key.get()
@@ -554,6 +561,7 @@ class TestOutput(TestCase):
ndb.transaction(result_summary.put)
self.run_result = task_result.new_run_result(
request, 1, 'localhost', 'abc', {})
+ self.run_result.started_ts = result_summary.modified_ts
self.run_result.modified_ts = utils.utcnow()
result_summary.set_from_run_result(self.run_result, request)
ndb.transaction(lambda: ndb.put_multi((result_summary, self.run_result)))
« no previous file with comments | « appengine/swarming/server/task_result.py ('k') | appengine/swarming/server/task_scheduler.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698