From c218c20e54a3bad7181db63e6304864d7e2ac622 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Thu, 24 Jul 2014 07:36:25 +0000 Subject: [PATCH] Fix automatic tagging. BUG= TBR=jarin@chromium.org Review URL: https://codereview.chromium.org/417973002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22580 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/push-to-trunk/auto_tag.py | 2 +- tools/push-to-trunk/common_includes.py | 2 +- tools/push-to-trunk/test_scripts.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/push-to-trunk/auto_tag.py b/tools/push-to-trunk/auto_tag.py index d2bf923..6beaaff 100755 --- a/tools/push-to-trunk/auto_tag.py +++ b/tools/push-to-trunk/auto_tag.py @@ -117,7 +117,7 @@ class CalculateTagRevision(Step): # LKGRs are reverse sorted. if int(min_rev) <= int(lkgr) and int(lkgr) < int(max_rev): return lkgr - return None + return None def RunStep(self): # Get the lkgr after the tag candidate and before the next tag candidate. diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py index d297602..0e57a25 100644 --- a/tools/push-to-trunk/common_includes.py +++ b/tools/push-to-trunk/common_includes.py @@ -245,7 +245,7 @@ class SideEffectHandler(object): # pragma: no cover return datetime.date.today().strftime("%Y-%m-%d") def GetUTCStamp(self): - time.mktime(datetime.datetime.utcnow().timetuple()) + return time.mktime(datetime.datetime.utcnow().timetuple()) DEFAULT_SIDE_EFFECT_HANDLER = SideEffectHandler() diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index f737076..9752ab7 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/push-to-trunk/test_scripts.py @@ -1373,7 +1373,8 @@ LOG=N self.ExpectReadURL([ URL("https://v8-status.appspot.com/revisions?format=json", - "[{\"revision\": \"123\", \"status\": true}," + "[{\"revision\": \"126\", \"status\": true}," + "{\"revision\": \"123\", \"status\": true}," "{\"revision\": \"112\", \"status\": true}]"), ]) -- 2.7.4