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 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1418 Cmd("git branch -D auto-bump-up-version", ""), | 1418 Cmd("git branch -D auto-bump-up-version", ""), |
1419 ] | 1419 ] |
1420 self.Expect(expectations) | 1420 self.Expect(expectations) |
1421 | 1421 |
1422 BumpUpVersion(TEST_CONFIG, self).Run(["-a", "author@chromium.org"]) | 1422 BumpUpVersion(TEST_CONFIG, self).Run(["-a", "author@chromium.org"]) |
1423 | 1423 |
1424 def testBumpUpVersionSvn(self): | 1424 def testBumpUpVersionSvn(self): |
1425 expectations = self._bumpUpVersion() | 1425 expectations = self._bumpUpVersion() |
1426 expectations += [ | 1426 expectations += [ |
1427 Cmd("git diff HEAD^ HEAD", "patch content"), | 1427 Cmd("git diff HEAD^ HEAD", "patch content"), |
| 1428 Cmd("svn update", "", cwd="[SVN_ROOT]"), |
| 1429 Cmd("svn status", "", cwd="[SVN_ROOT]"), |
1428 Cmd("patch -d branches/bleeding_edge -p1 -i %s" % | 1430 Cmd("patch -d branches/bleeding_edge -p1 -i %s" % |
1429 TEST_CONFIG[PATCH_FILE], "Applied patch...", cwd="[SVN_ROOT]"), | 1431 TEST_CONFIG[PATCH_FILE], "Applied patch...", cwd="[SVN_ROOT]"), |
1430 Cmd("svn commit --non-interactive --username=author@chromium.org " | 1432 Cmd("svn commit --non-interactive --username=author@chromium.org " |
1431 "--config-dir=[CONFIG_DIR] " | 1433 "--config-dir=[CONFIG_DIR] " |
1432 "-m \"[Auto-roll] Bump up version to 3.11.6.0\"", | 1434 "-m \"[Auto-roll] Bump up version to 3.11.6.0\"", |
1433 "", cwd="[SVN_ROOT]"), | 1435 "", cwd="[SVN_ROOT]"), |
1434 Cmd("git checkout -f bleeding_edge", ""), | 1436 Cmd("git checkout -f bleeding_edge", ""), |
1435 Cmd("git branch", "auto-bump-up-version\n* bleeding_edge"), | 1437 Cmd("git branch", "auto-bump-up-version\n* bleeding_edge"), |
1436 Cmd("git branch -D auto-bump-up-version", ""), | 1438 Cmd("git branch -D auto-bump-up-version", ""), |
1437 ] | 1439 ] |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1549 | 1551 |
1550 Review URL: https://codereview.chromium.org/83173002 | 1552 Review URL: https://codereview.chromium.org/83173002 |
1551 | 1553 |
1552 ------------------------------------------------------------------------""") | 1554 ------------------------------------------------------------------------""") |
1553 self.assertEquals( | 1555 self.assertEquals( |
1554 """Prepare push to trunk. Now working on version 3.23.11. | 1556 """Prepare push to trunk. Now working on version 3.23.11. |
1555 | 1557 |
1556 R=danno@chromium.org | 1558 R=danno@chromium.org |
1557 | 1559 |
1558 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1560 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
OLD | NEW |