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

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

Issue 699493004: Fix push script for autoroll account. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 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
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 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 cb=self.WriteFakeVersionFile), 941 cb=self.WriteFakeVersionFile),
942 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", 942 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
943 cb=CheckSVNCommit), 943 cb=CheckSVNCommit),
944 # TODO(machenbach): Change test to pure git after flag day. 944 # TODO(machenbach): Change test to pure git after flag day.
945 # Cmd("git push origin", ""), 945 # Cmd("git push origin", ""),
946 Cmd("git diff HEAD^ HEAD", "patch content"), 946 Cmd("git diff HEAD^ HEAD", "patch content"),
947 Cmd("svn update", "", cwd=svn_root), 947 Cmd("svn update", "", cwd=svn_root),
948 Cmd("svn status", "", cwd=svn_root), 948 Cmd("svn status", "", cwd=svn_root),
949 Cmd("patch -d trunk -p1 -i %s" % 949 Cmd("patch -d trunk -p1 -i %s" %
950 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root), 950 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root),
951 Cmd("svn add --force trunk", "", cwd=svn_root),
951 Cmd("svn commit --non-interactive --username=author@chromium.org " 952 Cmd("svn commit --non-interactive --username=author@chromium.org "
952 "--config-dir=[CONFIG_DIR] " 953 "--config-dir=[CONFIG_DIR] "
953 "-m \"Version 3.22.5 (based on push_hash)\"", 954 "-m \"Version 3.22.5 (based on push_hash)\"",
954 "", cwd=svn_root), 955 "", cwd=svn_root),
955 Cmd("git fetch", ""), 956 Cmd("git fetch", ""),
956 Cmd("git log -1 --format=%H --grep=" 957 Cmd("git log -1 --format=%H --grep="
957 "\"Version 3.22.5 (based on push_hash)\"" 958 "\"Version 3.22.5 (based on push_hash)\""
958 " origin/candidates", "hsh_to_tag"), 959 " origin/candidates", "hsh_to_tag"),
959 Cmd("git tag 3.22.5 hsh_to_tag", ""), 960 Cmd("git tag 3.22.5 hsh_to_tag", ""),
960 Cmd("git push origin 3.22.5", ""), 961 Cmd("git push https://chromium.googlesource.com/v8/v8 3.22.5", ""),
961 Cmd("git checkout -f some_branch", ""), 962 Cmd("git checkout -f some_branch", ""),
962 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""), 963 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
963 Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""), 964 Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""),
964 ] 965 ]
965 self.Expect(expectations) 966 self.Expect(expectations)
966 967
967 args = ["-a", "author@chromium.org", "--revision", "push_hash", 968 args = ["-a", "author@chromium.org", "--revision", "push_hash",
968 "--vc-interface", "git", "-f", "-r", "reviewer@chromium.org", 969 "--vc-interface", "git", "-f", "-r", "reviewer@chromium.org",
969 "--svn", svn_root, "--svn-config", "[CONFIG_DIR]"] 970 "--svn", svn_root, "--svn-config", "[CONFIG_DIR]"]
970 PushToTrunk(TEST_CONFIG, self).Run(args) 971 PushToTrunk(TEST_CONFIG, self).Run(args)
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
1762 1763
1763 def testBumpUpVersionSvn(self): 1764 def testBumpUpVersionSvn(self):
1764 svn_root = self.MakeEmptyTempDirectory() 1765 svn_root = self.MakeEmptyTempDirectory()
1765 expectations = self._bumpUpVersion() 1766 expectations = self._bumpUpVersion()
1766 expectations += [ 1767 expectations += [
1767 Cmd("git diff HEAD^ HEAD", "patch content"), 1768 Cmd("git diff HEAD^ HEAD", "patch content"),
1768 Cmd("svn update", "", cwd=svn_root), 1769 Cmd("svn update", "", cwd=svn_root),
1769 Cmd("svn status", "", cwd=svn_root), 1770 Cmd("svn status", "", cwd=svn_root),
1770 Cmd("patch -d branches/bleeding_edge -p1 -i %s" % 1771 Cmd("patch -d branches/bleeding_edge -p1 -i %s" %
1771 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root), 1772 TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root),
1773 Cmd("svn add --force branches/bleeding_edge", "", cwd=svn_root),
1772 Cmd("svn commit --non-interactive --username=author@chromium.org " 1774 Cmd("svn commit --non-interactive --username=author@chromium.org "
1773 "--config-dir=[CONFIG_DIR] " 1775 "--config-dir=[CONFIG_DIR] "
1774 "-m \"[Auto-roll] Bump up version to 3.11.6.0\"", 1776 "-m \"[Auto-roll] Bump up version to 3.11.6.0\"",
1775 "", cwd=svn_root), 1777 "", cwd=svn_root),
1776 Cmd("git checkout -f master", ""), 1778 Cmd("git checkout -f master", ""),
1777 Cmd("git branch", "auto-bump-up-version\n* master"), 1779 Cmd("git branch", "auto-bump-up-version\n* master"),
1778 Cmd("git branch -D auto-bump-up-version", ""), 1780 Cmd("git branch -D auto-bump-up-version", ""),
1779 ] 1781 ]
1780 self.Expect(expectations) 1782 self.Expect(expectations)
1781 1783
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 1840
1839 Review URL: https://codereview.chromium.org/83173002 1841 Review URL: https://codereview.chromium.org/83173002
1840 1842
1841 ------------------------------------------------------------------------""") 1843 ------------------------------------------------------------------------""")
1842 self.assertEquals( 1844 self.assertEquals(
1843 """Prepare push to trunk. Now working on version 3.23.11. 1845 """Prepare push to trunk. Now working on version 3.23.11.
1844 1846
1845 R=danno@chromium.org 1847 R=danno@chromium.org
1846 1848
1847 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) 1849 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)
OLDNEW
« tools/push-to-trunk/common_includes.py ('K') | « tools/push-to-trunk/common_includes.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698