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 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1108 self.Expect([ | 1108 self.Expect([ |
1109 URL("https://codereview.chromium.org/search", | 1109 URL("https://codereview.chromium.org/search", |
1110 "owner=author%40chromium.org&limit=30&closed=3&format=json", | 1110 "owner=author%40chromium.org&limit=30&closed=3&format=json", |
1111 ("{\"results\": [{\"subject\": \"different\"}]}")), | 1111 ("{\"results\": [{\"subject\": \"different\"}]}")), |
1112 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1112 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
1113 Cmd("git rev-list --max-age=740800 --tags", | 1113 Cmd("git rev-list --max-age=740800 --tags", |
1114 "bad_tag\nhash_234\nhash_123"), | 1114 "bad_tag\nhash_234\nhash_123"), |
1115 Cmd("git describe --tags bad_tag", ""), | 1115 Cmd("git describe --tags bad_tag", ""), |
1116 Cmd("git describe --tags hash_234", "3.22.4"), | 1116 Cmd("git describe --tags hash_234", "3.22.4"), |
1117 Cmd("git describe --tags hash_123", "3.22.3"), | 1117 Cmd("git describe --tags hash_123", "3.22.3"), |
1118 Cmd("git log --format=%H abcd123455..hash_234", ""), | 1118 Cmd("git describe --tags abcd123455", "3.22.4"), |
1119 Cmd("git log --format=%H abcd123455..hash_123", ""), | 1119 Cmd("git describe --tags hash_234", "3.22.4"), |
| 1120 Cmd("git describe --tags hash_123", "3.22.3"), |
1120 ]) | 1121 ]) |
1121 | 1122 |
1122 result = auto_roll.AutoRoll(TEST_CONFIG, self).Run( | 1123 result = auto_roll.AutoRoll(TEST_CONFIG, self).Run( |
1123 AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"]]) | 1124 AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"]]) |
1124 self.assertEquals(0, result) | 1125 self.assertEquals(0, result) |
1125 | 1126 |
1126 def testAutoRoll(self): | 1127 def testAutoRoll(self): |
1127 TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory() | 1128 TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory() |
1128 TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG["CHROMIUM"], "DEPS")) | 1129 TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG["CHROMIUM"], "DEPS")) |
1129 | 1130 |
1130 self.Expect([ | 1131 self.Expect([ |
1131 URL("https://codereview.chromium.org/search", | 1132 URL("https://codereview.chromium.org/search", |
1132 "owner=author%40chromium.org&limit=30&closed=3&format=json", | 1133 "owner=author%40chromium.org&limit=30&closed=3&format=json", |
1133 ("{\"results\": [{\"subject\": \"different\"}]}")), | 1134 ("{\"results\": [{\"subject\": \"different\"}]}")), |
1134 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1135 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
1135 Cmd("git rev-list --max-age=740800 --tags", | 1136 Cmd("git rev-list --max-age=740800 --tags", |
1136 "bad_tag\nhash_234\nhash_123"), | 1137 "bad_tag\nhash_234\nhash_123"), |
1137 Cmd("git describe --tags bad_tag", ""), | 1138 Cmd("git describe --tags bad_tag", ""), |
1138 Cmd("git describe --tags hash_234", "3.22.4"), | 1139 Cmd("git describe --tags hash_234", "3.22.4"), |
1139 Cmd("git describe --tags hash_123", "3.22.3"), | 1140 Cmd("git describe --tags hash_123", "3.22.3"), |
1140 Cmd("git log --format=%H abcd123455..hash_234", "hash1\nhash2\n"), | 1141 Cmd("git describe --tags abcd123455", "3.22.3.1"), |
| 1142 Cmd("git describe --tags hash_234", "3.22.4"), |
1141 ]) | 1143 ]) |
1142 | 1144 |
1143 result = auto_roll.AutoRoll(TEST_CONFIG, self).Run( | 1145 result = auto_roll.AutoRoll(TEST_CONFIG, self).Run( |
1144 AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"], "--roll"]) | 1146 AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"], "--roll"]) |
1145 self.assertEquals(0, result) | 1147 self.assertEquals(0, result) |
1146 | 1148 |
1147 def testMergeToBranch(self): | 1149 def testMergeToBranch(self): |
1148 TEST_CONFIG["ALREADY_MERGING_SENTINEL_FILE"] = self.MakeEmptyTempFile() | 1150 TEST_CONFIG["ALREADY_MERGING_SENTINEL_FILE"] = self.MakeEmptyTempFile() |
1149 TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git")) | 1151 TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git")) |
1150 self.WriteFakeVersionFile(build=5) | 1152 self.WriteFakeVersionFile(build=5) |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1540 | 1542 |
1541 Review URL: https://codereview.chromium.org/83173002 | 1543 Review URL: https://codereview.chromium.org/83173002 |
1542 | 1544 |
1543 ------------------------------------------------------------------------""") | 1545 ------------------------------------------------------------------------""") |
1544 self.assertEquals( | 1546 self.assertEquals( |
1545 """Prepare push to trunk. Now working on version 3.23.11. | 1547 """Prepare push to trunk. Now working on version 3.23.11. |
1546 | 1548 |
1547 R=danno@chromium.org | 1549 R=danno@chromium.org |
1548 | 1550 |
1549 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1551 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
OLD | NEW |