Index: tools/push-to-trunk/test_scripts.py |
diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py |
index 2cc08bacb015ec6f6ffdebb1e7fdce3104d36d41..0d8a5e534d951783f0cb82778ada340a69cc3ff3 100644 |
--- a/tools/push-to-trunk/test_scripts.py |
+++ b/tools/push-to-trunk/test_scripts.py |
@@ -77,14 +77,14 @@ def MakeOptions(s=0, l=None, f=False, m=True, r=None, c=None, a=None, |
class Options(object): |
pass |
options = Options() |
- options.s = s |
- options.l = l |
- options.f = f |
- options.m = m |
+ options.step = s |
+ options.last_push = l |
+ options.force = f |
+ options.manual = m |
options.reviewer = r |
- options.c = c |
- options.a = a |
- options.p = p |
+ options.chromium = c |
+ options.author = a |
+ options.push = p |
options.status_password = status_password |
options.revert_bleeding_edge = revert_bleeding_edge |
return options |
@@ -991,7 +991,7 @@ LOG=N |
self)) |
# Test that state recovery after restarting the script works. |
- options.s = 3 |
+ options.step = 3 |
RunMergeToBranch(TEST_CONFIG, MergeToBranchOptions(options), self) |