| 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 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1031 | 1031 |
| 1032 def testChromiumRollUpToDate(self): | 1032 def testChromiumRollUpToDate(self): |
| 1033 TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory() | 1033 TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory() |
| 1034 json_output_file = os.path.join(TEST_CONFIG["CHROMIUM"], "out.json") | 1034 json_output_file = os.path.join(TEST_CONFIG["CHROMIUM"], "out.json") |
| 1035 TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG["CHROMIUM"], "DEPS")) | 1035 TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG["CHROMIUM"], "DEPS")) |
| 1036 self.Expect([ | 1036 self.Expect([ |
| 1037 Cmd("git fetch origin", ""), | 1037 Cmd("git fetch origin", ""), |
| 1038 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1038 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
| 1039 Cmd("git describe --tags last_roll_hsh", "3.22.4"), | 1039 Cmd("git describe --tags last_roll_hsh", "3.22.4"), |
| 1040 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1040 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
| 1041 Cmd("git rev-list --max-age=740800 --tags", | 1041 Cmd("git rev-list --max-age=395200 --tags", |
| 1042 "bad_tag\nroll_hsh\nhash_123"), | 1042 "bad_tag\nroll_hsh\nhash_123"), |
| 1043 Cmd("git describe --tags bad_tag", ""), | 1043 Cmd("git describe --tags bad_tag", ""), |
| 1044 Cmd("git describe --tags roll_hsh", "3.22.4"), | 1044 Cmd("git describe --tags roll_hsh", "3.22.4"), |
| 1045 Cmd("git describe --tags hash_123", "3.22.3"), | 1045 Cmd("git describe --tags hash_123", "3.22.3"), |
| 1046 Cmd("git describe --tags roll_hsh", "3.22.4"), | 1046 Cmd("git describe --tags roll_hsh", "3.22.4"), |
| 1047 Cmd("git describe --tags hash_123", "3.22.3"), | 1047 Cmd("git describe --tags hash_123", "3.22.3"), |
| 1048 ]) | 1048 ]) |
| 1049 | 1049 |
| 1050 result = auto_roll.AutoRoll(TEST_CONFIG, self).Run( | 1050 result = auto_roll.AutoRoll(TEST_CONFIG, self).Run( |
| 1051 AUTO_PUSH_ARGS + [ | 1051 AUTO_PUSH_ARGS + [ |
| (...skipping 15 matching lines...) Expand all Loading... |
| 1067 | 1067 |
| 1068 def WriteDeps(): | 1068 def WriteDeps(): |
| 1069 TextToFile("Some line\n \"v8_revision\": \"22624\",\n some line", | 1069 TextToFile("Some line\n \"v8_revision\": \"22624\",\n some line", |
| 1070 os.path.join(chrome_dir, "DEPS")) | 1070 os.path.join(chrome_dir, "DEPS")) |
| 1071 | 1071 |
| 1072 expectations = [ | 1072 expectations = [ |
| 1073 Cmd("git fetch origin", ""), | 1073 Cmd("git fetch origin", ""), |
| 1074 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1074 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
| 1075 Cmd("git describe --tags last_roll_hsh", "3.22.3.1"), | 1075 Cmd("git describe --tags last_roll_hsh", "3.22.3.1"), |
| 1076 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), | 1076 Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), |
| 1077 Cmd("git rev-list --max-age=740800 --tags", | 1077 Cmd("git rev-list --max-age=395200 --tags", |
| 1078 "bad_tag\nroll_hsh\nhash_123"), | 1078 "bad_tag\nroll_hsh\nhash_123"), |
| 1079 Cmd("git describe --tags bad_tag", ""), | 1079 Cmd("git describe --tags bad_tag", ""), |
| 1080 Cmd("git describe --tags roll_hsh", "3.22.4"), | 1080 Cmd("git describe --tags roll_hsh", "3.22.4"), |
| 1081 Cmd("git describe --tags hash_123", "3.22.3"), | 1081 Cmd("git describe --tags hash_123", "3.22.3"), |
| 1082 Cmd("git describe --tags roll_hsh", "3.22.4"), | 1082 Cmd("git describe --tags roll_hsh", "3.22.4"), |
| 1083 Cmd("git log -1 --format=%s roll_hsh", "Version 3.22.4\n"), | 1083 Cmd("git log -1 --format=%s roll_hsh", "Version 3.22.4\n"), |
| 1084 Cmd("git describe --tags roll_hsh", "3.22.4"), | 1084 Cmd("git describe --tags roll_hsh", "3.22.4"), |
| 1085 Cmd("git describe --tags last_roll_hsh", "3.22.2.1"), | 1085 Cmd("git describe --tags last_roll_hsh", "3.22.2.1"), |
| 1086 Cmd("git status -s -uno", "", cwd=chrome_dir), | 1086 Cmd("git status -s -uno", "", cwd=chrome_dir), |
| 1087 Cmd("git checkout -f master", "", cwd=chrome_dir), | 1087 Cmd("git checkout -f master", "", cwd=chrome_dir), |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1546 | 1546 |
| 1547 Review URL: https://codereview.chromium.org/83173002 | 1547 Review URL: https://codereview.chromium.org/83173002 |
| 1548 | 1548 |
| 1549 ------------------------------------------------------------------------""") | 1549 ------------------------------------------------------------------------""") |
| 1550 self.assertEquals( | 1550 self.assertEquals( |
| 1551 """Prepare push to trunk. Now working on version 3.23.11. | 1551 """Prepare push to trunk. Now working on version 3.23.11. |
| 1552 | 1552 |
| 1553 R=danno@chromium.org | 1553 R=danno@chromium.org |
| 1554 | 1554 |
| 1555 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1555 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
| OLD | NEW |