Changeset 70374 in webkit
- Timestamp:
- Oct 22, 2010 5:41:07 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 5 edited
-
ChangeLog (modified) (1 diff)
-
Scripts/webkitpy/tool/bot/commitqueuetask.py (modified) (6 diffs)
-
Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (modified) (8 diffs)
-
Scripts/webkitpy/tool/commands/queues.py (modified) (1 diff)
-
Scripts/webkitpy/tool/commands/queues_unittest.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r70371 r70374 1 2010-10-22 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 commit-queue should not pass --quiet to subcommands now that the parent command does the reporting 6 https://bugs.webkit.org/show_bug.cgi?id=48165 7 8 * Scripts/webkitpy/tool/bot/commitqueuetask.py: 9 * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py: 10 * Scripts/webkitpy/tool/commands/queues_unittest.py: 11 1 12 2010-10-22 Mario Sanchez Prada <msanchez@igalia.com> 2 13 -
trunk/WebKitTools/Scripts/webkitpy/tool/bot/commitqueuetask.py
r69829 r70374 86 86 "--force-clean", 87 87 "--non-interactive", 88 "--quiet",89 88 self._patch.id(), 90 89 ], … … 98 97 "--no-update", 99 98 "--build-style=both", 100 "--quiet",101 99 ], 102 100 "Built patch", … … 109 107 "--no-update", 110 108 "--build-style=both", 111 "--quiet",112 109 ], 113 110 "Able to build without patch", … … 121 118 # Notice that we don't pass --build, which means we won't build! 122 119 "--test", 123 "--quiet",124 120 "--non-interactive", 125 121 ], … … 134 130 "--build", 135 131 "--test", 136 "--quiet",137 132 "--non-interactive", 138 133 ], … … 147 142 148 143 def _land(self): 144 # Unclear if this should pass --quiet or not. If --parent-command always does the reporting, then it should. 149 145 return self._run_command([ 150 146 "land-attachment", 151 147 "--force-clean", 152 148 "--ignore-builders", 153 "--quiet",154 149 "--non-interactive", 155 150 "--parent-command=commit-queue", -
trunk/WebKitTools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py
r69829 r70374 76 76 def test_success_case(self): 77 77 commit_queue = MockCommitQueue([]) 78 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]79 command_passed: success_message='Applied patch' patch='197' 80 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']81 command_passed: success_message='Built patch' patch='197' 82 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']78 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 79 command_passed: success_message='Applied patch' patch='197' 80 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both'] 81 command_passed: success_message='Built patch' patch='197' 82 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 83 83 command_passed: success_message='Passed tests' patch='197' 84 run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '-- quiet', '--non-interactive', '--parent-command=commit-queue', 197]84 run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197] 85 85 command_passed: success_message='Landed patch' patch='197' 86 86 """ … … 91 91 ScriptError("MOCK apply failure"), 92 92 ]) 93 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]93 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 94 94 command_failed: failure_message='Patch does not apply' script_error='MOCK apply failure' patch='197' 95 95 """ … … 101 101 ScriptError("MOCK build failure"), 102 102 ]) 103 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]104 command_passed: success_message='Applied patch' patch='197' 105 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']103 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 104 command_passed: success_message='Applied patch' patch='197' 105 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both'] 106 106 command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='197' 107 run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both' , '--quiet']107 run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both'] 108 108 command_passed: success_message='Able to build without patch' patch='197' 109 109 """ … … 116 116 ScriptError("MOCK clean build failure"), 117 117 ]) 118 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]119 command_passed: success_message='Applied patch' patch='197' 120 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']118 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 119 command_passed: success_message='Applied patch' patch='197' 120 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both'] 121 121 command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='197' 122 run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both' , '--quiet']122 run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both'] 123 123 command_failed: failure_message='Unable to build without patch' script_error='MOCK clean build failure' patch='197' 124 124 """ … … 131 131 ScriptError("MOCK tests failure"), 132 132 ]) 133 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]134 command_passed: success_message='Applied patch' patch='197' 135 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']136 command_passed: success_message='Built patch' patch='197' 137 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']133 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 134 command_passed: success_message='Applied patch' patch='197' 135 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both'] 136 command_passed: success_message='Built patch' patch='197' 137 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 138 138 command_failed: failure_message='Patch does not pass tests' script_error='MOCK tests failure' patch='197' 139 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']139 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 140 140 command_passed: success_message='Passed tests' patch='197' 141 141 report_flaky_tests: patch='197' flaky_tests='None' 142 run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '-- quiet', '--non-interactive', '--parent-command=commit-queue', 197]142 run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197] 143 143 command_passed: success_message='Landed patch' patch='197' 144 144 """ … … 152 152 ScriptError("MOCK test failure again"), 153 153 ]) 154 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]155 command_passed: success_message='Applied patch' patch='197' 156 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']157 command_passed: success_message='Built patch' patch='197' 158 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']154 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 155 command_passed: success_message='Applied patch' patch='197' 156 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both'] 157 command_passed: success_message='Built patch' patch='197' 158 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 159 159 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='197' 160 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']160 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 161 161 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='197' 162 run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '-- quiet', '--non-interactive']162 run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '--non-interactive'] 163 163 command_passed: success_message='Able to pass tests without patch' patch='197' 164 164 """ … … 173 173 ScriptError("MOCK clean test failure"), 174 174 ]) 175 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]176 command_passed: success_message='Applied patch' patch='197' 177 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']178 command_passed: success_message='Built patch' patch='197' 179 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']175 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 176 command_passed: success_message='Applied patch' patch='197' 177 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both'] 178 command_passed: success_message='Built patch' patch='197' 179 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 180 180 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='197' 181 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']181 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 182 182 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='197' 183 run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '-- quiet', '--non-interactive']183 run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '--non-interactive'] 184 184 command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='197' 185 185 """ … … 193 193 ScriptError("MOCK land failure"), 194 194 ]) 195 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]196 command_passed: success_message='Applied patch' patch='197' 197 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']198 command_passed: success_message='Built patch' patch='197' 199 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']195 expected_stderr = """run_webkit_patch: ['apply-attachment', '--force-clean', '--non-interactive', 197] 196 command_passed: success_message='Applied patch' patch='197' 197 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both'] 198 command_passed: success_message='Built patch' patch='197' 199 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 200 200 command_passed: success_message='Passed tests' patch='197' 201 run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '-- quiet', '--non-interactive', '--parent-command=commit-queue', 197]201 run_webkit_patch: ['land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197] 202 202 command_failed: failure_message='Unable to land patch' script_error='MOCK land failure' patch='197' 203 203 """ -
trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
r70254 r70374 88 88 webkit_patch_args += ["--port=%s" % self._options.port] 89 89 webkit_patch_args.extend(args) 90 # FIXME: There is probably no reason to use run_and_throw_if_fail anymore. 91 # run_and_throw_if_fail was invented to support tee'd output 92 # (where we write both to a log file and to the console at once), 93 # but the queues don't need live-progress, a dump-of-output at the 94 # end should be sufficient. 90 95 return self._tool.executive.run_and_throw_if_fail(webkit_patch_args) 91 96 -
trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
r70328 r70374 240 240 "should_proceed_with_work_item": "MOCK: update_status: commit-queue Processing patch\n", 241 241 "next_work_item": "", 242 "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet',197]242 "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--force-clean', '--non-interactive', 197] 243 243 MOCK: update_status: commit-queue Applied patch 244 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']244 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build-style=both'] 245 245 MOCK: update_status: commit-queue Built patch 246 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build-and-test', '--no-clean', '--no-update', '--test', '-- quiet', '--non-interactive']246 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'] 247 247 MOCK: update_status: commit-queue Passed tests 248 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--ignore-builders', '-- quiet', '--non-interactive', '--parent-command=commit-queue', 197]248 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 197] 249 249 MOCK: update_status: commit-queue Landed patch 250 250 MOCK: update_status: commit-queue Pass … … 265 265 "should_proceed_with_work_item": "MOCK: update_status: commit-queue Processing rollout patch\n", 266 266 "next_work_item": "", 267 "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet',106]267 "process_work_item": """MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--force-clean', '--non-interactive', 106] 268 268 MOCK: update_status: commit-queue Applied patch 269 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build-style=both' , '--quiet']269 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build-style=both'] 270 270 MOCK: update_status: commit-queue Built patch 271 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--ignore-builders', '-- quiet', '--non-interactive', '--parent-command=commit-queue', 106]271 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--ignore-builders', '--non-interactive', '--parent-command=commit-queue', 106] 272 272 MOCK: update_status: commit-queue Landed patch 273 273 MOCK: update_status: commit-queue Pass
Note: See TracChangeset
for help on using the changeset viewer.
