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

Side by Side Diff: tools/push-to-trunk/test_scripts.py

Issue 72703002: Fixed blocking dcommit in push-to-trunk script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « tools/push-to-trunk/push_to_trunk.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2013 the V8 project authors. All rights reserved. 2 # Copyright 2013 the V8 project authors. All rights reserved.
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following 10 # copyright notice, this list of conditions and the following
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 ["log 1234..HEAD --format=%H", "rev1\n"], 377 ["log 1234..HEAD --format=%H", "rev1\n"],
378 ["log -1 rev1 --format=\"%w(80,8,8)%s\"", " Log text 1.\n"], 378 ["log -1 rev1 --format=\"%w(80,8,8)%s\"", " Log text 1.\n"],
379 ["log -1 rev1 --format=\"%B\"", "Text\nBUG=v8:321\nText\n"], 379 ["log -1 rev1 --format=\"%B\"", "Text\nBUG=v8:321\nText\n"],
380 ["log -1 rev1 --format=\"%w(80,8,8)(%an)\"", 380 ["log -1 rev1 --format=\"%w(80,8,8)(%an)\"",
381 " author1@chromium.org\n"], 381 " author1@chromium.org\n"],
382 [("commit -a -m \"Prepare push to trunk. " 382 [("commit -a -m \"Prepare push to trunk. "
383 "Now working on version 3.22.6.\""), 383 "Now working on version 3.22.6.\""),
384 " 2 files changed\n", 384 " 2 files changed\n",
385 CheckPreparePush], 385 CheckPreparePush],
386 ["cl upload -r \"reviewer@chromium.org\" --send-mail", "done\n"], 386 ["cl upload -r \"reviewer@chromium.org\" --send-mail", "done\n"],
387 ["cl dcommit -v", "Closing issue\n"], 387 ["cl dcommit -f", "Closing issue\n"],
388 ["svn fetch", "fetch result\n"], 388 ["svn fetch", "fetch result\n"],
389 ["checkout svn/bleeding_edge", ""], 389 ["checkout svn/bleeding_edge", ""],
390 [("log -1 --format=%H --grep=\"Prepare push to trunk. " 390 [("log -1 --format=%H --grep=\"Prepare push to trunk. "
391 "Now working on version 3.22.6.\""), 391 "Now working on version 3.22.6.\""),
392 "hash1\n"], 392 "hash1\n"],
393 ["diff svn/trunk hash1", "patch content\n"], 393 ["diff svn/trunk hash1", "patch content\n"],
394 ["checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], ""], 394 ["checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], ""],
395 ["apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""], 395 ["apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""],
396 ["add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""], 396 ["add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""],
397 ["commit -F \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "", CheckSVNCommit], 397 ["commit -F \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "", CheckSVNCommit],
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 435
436 cl = FileToText(TEST_CONFIG[CHANGELOG_FILE]) 436 cl = FileToText(TEST_CONFIG[CHANGELOG_FILE])
437 self.assertTrue(re.search(r"\d\d\d\d\-\d+\-\d+: Version 3\.22\.5", cl)) 437 self.assertTrue(re.search(r"\d\d\d\d\-\d+\-\d+: Version 3\.22\.5", cl))
438 self.assertTrue(re.search(r" Log text 1", cl)) 438 self.assertTrue(re.search(r" Log text 1", cl))
439 self.assertTrue(re.search(r" \(issue 321\)", cl)) 439 self.assertTrue(re.search(r" \(issue 321\)", cl))
440 self.assertTrue(re.search(r"1999\-04\-05: Version 3\.22\.4", cl)) 440 self.assertTrue(re.search(r"1999\-04\-05: Version 3\.22\.4", cl))
441 441
442 # Note: The version file is on build number 5 again in the end of this test 442 # Note: The version file is on build number 5 again in the end of this test
443 # since the git command that merges to the bleeding edge branch is mocked 443 # since the git command that merges to the bleeding edge branch is mocked
444 # out. 444 # out.
OLDNEW
« no previous file with comments | « tools/push-to-trunk/push_to_trunk.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698