| OLD | NEW |
| 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 949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 Cmd("git tag 3.22.5 hsh_to_tag", ""), | 960 Cmd("git tag 3.22.5 hsh_to_tag", ""), |
| 961 Cmd("git push https://chromium.googlesource.com/v8/v8 3.22.5", ""), | 961 Cmd("git push https://chromium.googlesource.com/v8/v8 3.22.5", ""), |
| 962 Cmd("git checkout -f some_branch", ""), | 962 Cmd("git checkout -f some_branch", ""), |
| 963 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""), | 963 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""), |
| 964 Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""), | 964 Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""), |
| 965 ] | 965 ] |
| 966 self.Expect(expectations) | 966 self.Expect(expectations) |
| 967 | 967 |
| 968 args = ["-a", "author@chromium.org", "--revision", "push_hash", | 968 args = ["-a", "author@chromium.org", "--revision", "push_hash", |
| 969 "--vc-interface", "git", "-f", "-r", "reviewer@chromium.org", | 969 "--vc-interface", "git", "-f", "-r", "reviewer@chromium.org", |
| 970 "--svn", svn_root, "--svn-config", "[CONFIG_DIR]"] | 970 "--svn", svn_root, "--svn-config", "[CONFIG_DIR]", |
| 971 "--work-dir", TEST_CONFIG["DEFAULT_CWD"]] |
| 971 PushToTrunk(TEST_CONFIG, self).Run(args) | 972 PushToTrunk(TEST_CONFIG, self).Run(args) |
| 972 | 973 |
| 973 cl = FileToText(TEST_CONFIG["CHANGELOG_FILE"]) | 974 cl = FileToText(TEST_CONFIG["CHANGELOG_FILE"]) |
| 974 self.assertTrue(re.search(r"^\d\d\d\d\-\d+\-\d+: Version 3\.22\.5", cl)) | 975 self.assertTrue(re.search(r"^\d\d\d\d\-\d+\-\d+: Version 3\.22\.5", cl)) |
| 975 self.assertTrue(re.search(r" Log text 1 \(issue 321\).", cl)) | 976 self.assertTrue(re.search(r" Log text 1 \(issue 321\).", cl)) |
| 976 self.assertTrue(re.search(r"1999\-04\-05: Version 3\.22\.4", cl)) | 977 self.assertTrue(re.search(r"1999\-04\-05: Version 3\.22\.4", cl)) |
| 977 | 978 |
| 978 # Note: The version file is on build number 5 again in the end of this test | 979 # Note: The version file is on build number 5 again in the end of this test |
| 979 # since the git command that merges to the bleeding edge branch is mocked | 980 # since the git command that merges to the bleeding edge branch is mocked |
| 980 # out. | 981 # out. |
| (...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1840 | 1841 |
| 1841 Review URL: https://codereview.chromium.org/83173002 | 1842 Review URL: https://codereview.chromium.org/83173002 |
| 1842 | 1843 |
| 1843 ------------------------------------------------------------------------""") | 1844 ------------------------------------------------------------------------""") |
| 1844 self.assertEquals( | 1845 self.assertEquals( |
| 1845 """Prepare push to trunk. Now working on version 3.23.11. | 1846 """Prepare push to trunk. Now working on version 3.23.11. |
| 1846 | 1847 |
| 1847 R=danno@chromium.org | 1848 R=danno@chromium.org |
| 1848 | 1849 |
| 1849 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1850 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
| OLD | NEW |