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

Unified Diff: tests/checkout_test.py

Issue 271283003: Revert of Have apply_patch.py/checkout.py stage git patches instead of committing them (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « checkout.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/checkout_test.py
diff --git a/tests/checkout_test.py b/tests/checkout_test.py
index d07f15ac7a80e0827d134a1843535c73b8d8bd2d..e36aac8877644b2551fa550bfdcaa2faca03635c 100755
--- a/tests/checkout_test.py
+++ b/tests/checkout_test.py
@@ -423,7 +423,7 @@
for k, v in self.FAKE_REPOS.git_hashes[
self.FAKE_REPOS.TEST_GIT_REPO][1][1].iteritems():
assert k not in tree
- tree[k] = v
+ tree[k] = v
if modified:
content_lines = tree['chrome/file.cc'].splitlines(True)
@@ -470,7 +470,7 @@
co = self._get_co(None)
self._check_move(co)
out = subprocess2.check_output(
- ['git', 'diff', '--staged', '--name-status'], cwd=co.project_path)
+ ['git', 'diff', 'HEAD~', '--name-status'], cwd=co.project_path)
out = sorted(out.splitlines())
expected = sorted(
[
« no previous file with comments | « checkout.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698