Changeset 95543 in webkit


Ignore:
Timestamp:
Sep 20, 2011 8:43:07 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Fix patch and bug numbering in the mocktool simulation code
​https://bugs.webkit.org/show_bug.cgi?id=68374

Patch by Tom Zakrajsek <​tomz@codeaurora.org> on 2011-09-20
Reviewed by Adam Barth.

  • Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
  • Scripts/webkitpy/tool/bot/feeders_unittest.py:
  • Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
  • Scripts/webkitpy/tool/bot/irc_command_unittest.py:
  • Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py:
  • Scripts/webkitpy/tool/bot/queueengine_unittest.py:
  • Scripts/webkitpy/tool/commands/download_unittest.py:
  • Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
  • Scripts/webkitpy/tool/commands/queries_unittest.py:
  • Scripts/webkitpy/tool/commands/queues_unittest.py:
  • Scripts/webkitpy/tool/commands/queuestest.py:
  • Scripts/webkitpy/tool/commands/upload_unittest.py:
  • Scripts/webkitpy/tool/mocktool.py:
  • Scripts/webkitpy/tool/steps/steps_unittest.py:
  • Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py:
Location:
trunk/Tools
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r95541 r95543  
     12011-09-20  Tom Zakrajsek  <tomz@codeaurora.org>
     2
     3        Fix patch and bug numbering in the mocktool simulation code
     4        https://bugs.webkit.org/show_bug.cgi?id=68374
     5
     6        Reviewed by Adam Barth.
     7
     8        * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
     9        * Scripts/webkitpy/tool/bot/feeders_unittest.py:
     10        * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
     11        * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
     12        * Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py:
     13        * Scripts/webkitpy/tool/bot/queueengine_unittest.py:
     14        * Scripts/webkitpy/tool/commands/download_unittest.py:
     15        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
     16        * Scripts/webkitpy/tool/commands/queries_unittest.py:
     17        * Scripts/webkitpy/tool/commands/queues_unittest.py:
     18        * Scripts/webkitpy/tool/commands/queuestest.py:
     19        * Scripts/webkitpy/tool/commands/upload_unittest.py:
     20        * Scripts/webkitpy/tool/mocktool.py:
     21        * Scripts/webkitpy/tool/steps/steps_unittest.py:
     22        * Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py:
     23
    1242011-09-20  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    225

  • trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

    r94978 r95543  
    119119    def _run_through_task(self, commit_queue, expected_stderr, expected_exception=None, expect_retry=False):
    120120        tool = MockTool(log_executive=True)
    121         patch = tool.bugs.fetch_attachment(197)
     121        patch = tool.bugs.fetch_attachment(10000)
    122122        task = CommitQueueTask(commit_queue, patch)
    123123        success = OutputCapture().assert_outputs(self, task.run, expected_stderr=expected_stderr, expected_exception=expected_exception)
    … …  
    129129        commit_queue = MockCommitQueue([])
    130130        expected_stderr = """run_webkit_patch: ['clean']
    131 command_passed: success_message='Cleaned working directory' patch='197'
    132 run_webkit_patch: ['update']
    133 command_passed: success_message='Updated working directory' patch='197'
    134 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    135 command_passed: success_message='Applied patch' patch='197'
    136 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    137 command_passed: success_message='Built patch' patch='197'
    138 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    139 command_passed: success_message='Passed tests' patch='197'
    140 run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
    141 command_passed: success_message='Landed patch' patch='197'
     131command_passed: success_message='Cleaned working directory' patch='10000'
     132run_webkit_patch: ['update']
     133command_passed: success_message='Updated working directory' patch='10000'
     134run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     135command_passed: success_message='Applied patch' patch='10000'
     136run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     137command_passed: success_message='Built patch' patch='10000'
     138run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     139command_passed: success_message='Passed tests' patch='10000'
     140run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
     141command_passed: success_message='Landed patch' patch='10000'
    142142"""
    143143        self._run_through_task(commit_queue, expected_stderr)
    … …  
    148148        ])
    149149        expected_stderr = """run_webkit_patch: ['clean']
    150 command_failed: failure_message='Unable to clean working directory' script_error='MOCK clean failure' patch='197'
     150command_failed: failure_message='Unable to clean working directory' script_error='MOCK clean failure' patch='10000'
    151151"""
    152152        self._run_through_task(commit_queue, expected_stderr, expect_retry=True)
    … …  
    158158        ])
    159159        expected_stderr = """run_webkit_patch: ['clean']
    160 command_passed: success_message='Cleaned working directory' patch='197'
    161 run_webkit_patch: ['update']
    162 command_failed: failure_message='Unable to update working directory' script_error='MOCK update failure' patch='197'
     160command_passed: success_message='Cleaned working directory' patch='10000'
     161run_webkit_patch: ['update']
     162command_failed: failure_message='Unable to update working directory' script_error='MOCK update failure' patch='10000'
    163163"""
    164164        self._run_through_task(commit_queue, expected_stderr, expect_retry=True)
    … …  
    171171        ])
    172172        expected_stderr = """run_webkit_patch: ['clean']
    173 command_passed: success_message='Cleaned working directory' patch='197'
    174 run_webkit_patch: ['update']
    175 command_passed: success_message='Updated working directory' patch='197'
    176 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    177 command_failed: failure_message='Patch does not apply' script_error='MOCK apply failure' patch='197'
     173command_passed: success_message='Cleaned working directory' patch='10000'
     174run_webkit_patch: ['update']
     175command_passed: success_message='Updated working directory' patch='10000'
     176run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     177command_failed: failure_message='Patch does not apply' script_error='MOCK apply failure' patch='10000'
    178178"""
    179179        self._run_through_task(commit_queue, expected_stderr, GoldenScriptError)
    … …  
    187187        ])
    188188        expected_stderr = """run_webkit_patch: ['clean']
    189 command_passed: success_message='Cleaned working directory' patch='197'
    190 run_webkit_patch: ['update']
    191 command_passed: success_message='Updated working directory' patch='197'
    192 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    193 command_passed: success_message='Applied patch' patch='197'
    194 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    195 command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='197'
     189command_passed: success_message='Cleaned working directory' patch='10000'
     190run_webkit_patch: ['update']
     191command_passed: success_message='Updated working directory' patch='10000'
     192run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     193command_passed: success_message='Applied patch' patch='10000'
     194run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     195command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='10000'
    196196run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both']
    197 command_passed: success_message='Able to build without patch' patch='197'
     197command_passed: success_message='Able to build without patch' patch='10000'
    198198"""
    199199        self._run_through_task(commit_queue, expected_stderr, GoldenScriptError)
    … …  
    208208        ])
    209209        expected_stderr = """run_webkit_patch: ['clean']
    210 command_passed: success_message='Cleaned working directory' patch='197'
    211 run_webkit_patch: ['update']
    212 command_passed: success_message='Updated working directory' patch='197'
    213 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    214 command_passed: success_message='Applied patch' patch='197'
    215 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    216 command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='197'
     210command_passed: success_message='Cleaned working directory' patch='10000'
     211run_webkit_patch: ['update']
     212command_passed: success_message='Updated working directory' patch='10000'
     213run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     214command_passed: success_message='Applied patch' patch='10000'
     215run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     216command_failed: failure_message='Patch does not build' script_error='MOCK build failure' patch='10000'
    217217run_webkit_patch: ['build', '--force-clean', '--no-update', '--build-style=both']
    218 command_failed: failure_message='Unable to build without patch' script_error='MOCK clean build failure' patch='197'
     218command_failed: failure_message='Unable to build without patch' script_error='MOCK clean build failure' patch='10000'
    219219"""
    220220        self._run_through_task(commit_queue, expected_stderr, expect_retry=True)
    … …  
    232232        commit_queue.layout_test_results = lambda: LayoutTestResults([])
    233233        expected_stderr = """run_webkit_patch: ['clean']
    234 command_passed: success_message='Cleaned working directory' patch='197'
    235 run_webkit_patch: ['update']
    236 command_passed: success_message='Updated working directory' patch='197'
    237 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    238 command_passed: success_message='Applied patch' patch='197'
    239 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    240 command_passed: success_message='Built patch' patch='197'
    241 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    242 command_failed: failure_message='Patch does not pass tests' script_error='MOCK tests failure' patch='197'
    243 archive_last_layout_test_results: patch='197'
    244 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    245 command_passed: success_message='Passed tests' patch='197'
    246 report_flaky_tests: patch='197' flaky_tests='[]' archive='mock-archive-197.zip'
    247 run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
    248 command_passed: success_message='Landed patch' patch='197'
     234command_passed: success_message='Cleaned working directory' patch='10000'
     235run_webkit_patch: ['update']
     236command_passed: success_message='Updated working directory' patch='10000'
     237run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     238command_passed: success_message='Applied patch' patch='10000'
     239run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     240command_passed: success_message='Built patch' patch='10000'
     241run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     242command_failed: failure_message='Patch does not pass tests' script_error='MOCK tests failure' patch='10000'
     243archive_last_layout_test_results: patch='10000'
     244run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     245command_passed: success_message='Passed tests' patch='10000'
     246report_flaky_tests: patch='10000' flaky_tests='[]' archive='mock-archive-10000.zip'
     247run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
     248command_passed: success_message='Landed patch' patch='10000'
    249249"""
    250250        self._run_through_task(commit_queue, expected_stderr)
    … …  
    263263        commit_queue.archive_last_layout_test_results = lambda patch: None
    264264        expected_stderr = """run_webkit_patch: ['clean']
    265 command_passed: success_message='Cleaned working directory' patch='197'
    266 run_webkit_patch: ['update']
    267 command_passed: success_message='Updated working directory' patch='197'
    268 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    269 command_passed: success_message='Applied patch' patch='197'
    270 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    271 command_passed: success_message='Built patch' patch='197'
    272 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    273 command_failed: failure_message='Patch does not pass tests' script_error='MOCK tests failure' patch='197'
    274 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    275 command_passed: success_message='Passed tests' patch='197'
    276 run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
    277 command_passed: success_message='Landed patch' patch='197'
     265command_passed: success_message='Cleaned working directory' patch='10000'
     266run_webkit_patch: ['update']
     267command_passed: success_message='Updated working directory' patch='10000'
     268run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     269command_passed: success_message='Applied patch' patch='10000'
     270run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     271command_passed: success_message='Built patch' patch='10000'
     272run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     273command_failed: failure_message='Patch does not pass tests' script_error='MOCK tests failure' patch='10000'
     274run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     275command_passed: success_message='Passed tests' patch='10000'
     276run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
     277command_passed: success_message='Landed patch' patch='10000'
    278278"""
    279279        self._run_through_task(commit_queue, expected_stderr)
    … …  
    296296        # Note also that there is no attempt to run the tests w/o the patch.
    297297        expected_stderr = """run_webkit_patch: ['clean']
    298 command_passed: success_message='Cleaned working directory' patch='197'
    299 run_webkit_patch: ['update']
    300 command_passed: success_message='Updated working directory' patch='197'
    301 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    302 command_passed: success_message='Applied patch' patch='197'
    303 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    304 command_passed: success_message='Built patch' patch='197'
    305 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    306 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='197'
    307 archive_last_layout_test_results: patch='197'
    308 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    309 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='197'
     298command_passed: success_message='Cleaned working directory' patch='10000'
     299run_webkit_patch: ['update']
     300command_passed: success_message='Updated working directory' patch='10000'
     301run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     302command_passed: success_message='Applied patch' patch='10000'
     303run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     304command_passed: success_message='Built patch' patch='10000'
     305run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     306command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='10000'
     307archive_last_layout_test_results: patch='10000'
     308run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     309command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='10000'
    310310"""
    311311        tool = MockTool(log_executive=True)
    312         patch = tool.bugs.fetch_attachment(197)
     312        patch = tool.bugs.fetch_attachment(10000)
    313313        task = CommitQueueTask(commit_queue, patch)
    314314        success = OutputCapture().assert_outputs(self, task.run, expected_stderr=expected_stderr)
    … …  
    325325        ])
    326326        expected_stderr = """run_webkit_patch: ['clean']
    327 command_passed: success_message='Cleaned working directory' patch='197'
    328 run_webkit_patch: ['update']
    329 command_passed: success_message='Updated working directory' patch='197'
    330 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    331 command_passed: success_message='Applied patch' patch='197'
    332 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    333 command_passed: success_message='Built patch' patch='197'
    334 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    335 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='197'
    336 archive_last_layout_test_results: patch='197'
    337 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    338 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='197'
    339 archive_last_layout_test_results: patch='197'
     327command_passed: success_message='Cleaned working directory' patch='10000'
     328run_webkit_patch: ['update']
     329command_passed: success_message='Updated working directory' patch='10000'
     330run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     331command_passed: success_message='Applied patch' patch='10000'
     332run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     333command_passed: success_message='Built patch' patch='10000'
     334run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     335command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='10000'
     336archive_last_layout_test_results: patch='10000'
     337run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     338command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='10000'
     339archive_last_layout_test_results: patch='10000'
    340340run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '--non-interactive']
    341 command_passed: success_message='Able to pass tests without patch' patch='197'
     341command_passed: success_message='Able to pass tests without patch' patch='10000'
    342342"""
    343343        self._run_through_task(commit_queue, expected_stderr, GoldenScriptError)
    … …  
    361361        # should still be able to land in this case!
    362362        expected_stderr = """run_webkit_patch: ['clean']
    363 command_passed: success_message='Cleaned working directory' patch='197'
    364 run_webkit_patch: ['update']
    365 command_passed: success_message='Updated working directory' patch='197'
    366 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    367 command_passed: success_message='Applied patch' patch='197'
    368 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    369 command_passed: success_message='Built patch' patch='197'
    370 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    371 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='197'
    372 archive_last_layout_test_results: patch='197'
    373 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    374 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='197'
    375 archive_last_layout_test_results: patch='197'
     363command_passed: success_message='Cleaned working directory' patch='10000'
     364run_webkit_patch: ['update']
     365command_passed: success_message='Updated working directory' patch='10000'
     366run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     367command_passed: success_message='Applied patch' patch='10000'
     368run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     369command_passed: success_message='Built patch' patch='10000'
     370run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     371command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='10000'
     372archive_last_layout_test_results: patch='10000'
     373run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     374command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='10000'
     375archive_last_layout_test_results: patch='10000'
    376376run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '--non-interactive']
    377 command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='197'
    378 run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
    379 command_passed: success_message='Landed patch' patch='197'
     377command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='10000'
     378run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
     379command_passed: success_message='Landed patch' patch='10000'
    380380"""
    381381        self._run_through_task(commit_queue, expected_stderr)
    … …  
    401401        # just give up and retry the patch.
    402402        expected_stderr = """run_webkit_patch: ['clean']
    403 command_passed: success_message='Cleaned working directory' patch='197'
    404 run_webkit_patch: ['update']
    405 command_passed: success_message='Updated working directory' patch='197'
    406 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    407 command_passed: success_message='Applied patch' patch='197'
    408 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    409 command_passed: success_message='Built patch' patch='197'
    410 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    411 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='197'
    412 archive_last_layout_test_results: patch='197'
    413 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    414 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='197'
    415 archive_last_layout_test_results: patch='197'
     403command_passed: success_message='Cleaned working directory' patch='10000'
     404run_webkit_patch: ['update']
     405command_passed: success_message='Updated working directory' patch='10000'
     406run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     407command_passed: success_message='Applied patch' patch='10000'
     408run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     409command_passed: success_message='Built patch' patch='10000'
     410run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     411command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='10000'
     412archive_last_layout_test_results: patch='10000'
     413run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     414command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='10000'
     415archive_last_layout_test_results: patch='10000'
    416416run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '--non-interactive']
    417 command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='197'
     417command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='10000'
    418418"""
    419419        self._run_through_task(commit_queue, expected_stderr, expect_retry=True)
    … …  
    437437        # while the patch fails two.  So we should reject the patch!
    438438        expected_stderr = """run_webkit_patch: ['clean']
    439 command_passed: success_message='Cleaned working directory' patch='197'
    440 run_webkit_patch: ['update']
    441 command_passed: success_message='Updated working directory' patch='197'
    442 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    443 command_passed: success_message='Applied patch' patch='197'
    444 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    445 command_passed: success_message='Built patch' patch='197'
    446 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    447 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='197'
    448 archive_last_layout_test_results: patch='197'
    449 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    450 command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='197'
    451 archive_last_layout_test_results: patch='197'
     439command_passed: success_message='Cleaned working directory' patch='10000'
     440run_webkit_patch: ['update']
     441command_passed: success_message='Updated working directory' patch='10000'
     442run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     443command_passed: success_message='Applied patch' patch='10000'
     444run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     445command_passed: success_message='Built patch' patch='10000'
     446run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     447command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='10000'
     448archive_last_layout_test_results: patch='10000'
     449run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     450command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure again' patch='10000'
     451archive_last_layout_test_results: patch='10000'
    452452run_webkit_patch: ['build-and-test', '--force-clean', '--no-update', '--build', '--test', '--non-interactive']
    453 command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='197'
     453command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='10000'
    454454"""
    455455        task = self._run_through_task(commit_queue, expected_stderr, GoldenScriptError)
    … …  
    466466        ])
    467467        expected_stderr = """run_webkit_patch: ['clean']
    468 command_passed: success_message='Cleaned working directory' patch='197'
    469 run_webkit_patch: ['update']
    470 command_passed: success_message='Updated working directory' patch='197'
    471 run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 197]
    472 command_passed: success_message='Applied patch' patch='197'
    473 run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
    474 command_passed: success_message='Built patch' patch='197'
    475 run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
    476 command_passed: success_message='Passed tests' patch='197'
    477 run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197]
    478 command_failed: failure_message='Unable to land patch' script_error='MOCK land failure' patch='197'
     468command_passed: success_message='Cleaned working directory' patch='10000'
     469run_webkit_patch: ['update']
     470command_passed: success_message='Updated working directory' patch='10000'
     471run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
     472command_passed: success_message='Applied patch' patch='10000'
     473run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
     474command_passed: success_message='Built patch' patch='10000'
     475run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
     476command_passed: success_message='Passed tests' patch='10000'
     477run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
     478command_failed: failure_message='Unable to land patch' script_error='MOCK land failure' patch='10000'
    479479"""
    480480        # FIXME: This should really be expect_retry=True for a better user experiance.

  • trunk/Tools/Scripts/webkitpy/tool/bot/feeders_unittest.py

    r75366 r95543  
    3939    def test_commit_queue_feeder(self):
    4040        feeder = CommitQueueFeeder(MockTool())
    41         expected_stderr = u"""Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)
    42 Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)
    43 MOCK setting flag 'commit-queue' to '-' on attachment '128' with comment 'Rejecting attachment 128 from commit-queue.' and additional comment 'non-committer@example.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.
     41        expected_stderr = u"""Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com)
     42Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com)
     43MOCK setting flag 'commit-queue' to '-' on attachment '10001' with comment 'Rejecting attachment 10001 from commit-queue.' and additional comment 'non-committer@example.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.
    4444
    4545- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.
    4646
    4747- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.'
    48 MOCK: update_work_items: commit-queue [106, 197]
    49 Feeding commit-queue items [106, 197]
     48MOCK: update_work_items: commit-queue [10005, 10000]
     49Feeding commit-queue items [10005, 10000]
    5050"""
    5151        OutputCapture().assert_outputs(self, feeder.feed, expected_stderr=expected_stderr)

  • trunk/Tools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py

    r91210 r95543  
    9595        tool = MockTool()
    9696        reporter = FlakyTestReporter(tool, 'dummy-queue')
    97         bug = tool.bugs.fetch_bug(78)
    98         self.assertEqual(reporter._follow_duplicate_chain(bug).id(), 76)
     97        bug = tool.bugs.fetch_bug(50004)
     98        self.assertEqual(reporter._follow_duplicate_chain(bug).id(), 50002)
    9999
    100100    def test_report_flaky_tests_creating_bug(self):
    … …  
    104104        reporter = FlakyTestReporter(tool, 'dummy-queue')
    105105        reporter._lookup_bug_for_flaky_test = lambda bug_id: None
    106         patch = tool.bugs.fetch_attachment(197)
     106        patch = tool.bugs.fetch_attachment(10000)
    107107        expected_stderr = """MOCK create_bug
    108108bug_title: Flaky Test: foo/bar.html
    … …  
    113113http://trac.webkit.org/browser/trunk/LayoutTests/foo/bar.html
    114114
    115 The dummy-queue just saw foo/bar.html flake (Text diff mismatch) while processing attachment 197 on bug 42.
     115The dummy-queue just saw foo/bar.html flake (Text diff mismatch) while processing attachment 10000 on bug 50000.
    116116Bot: mock-bot-id  Port: MockPort  Platform: MockPlatform 1.0
    117117
    … …  
    125125cc: abarth@webkit.org
    126126blocked: 50856
    127 MOCK add_attachment_to_bug: bug_id=78, description=Failure diff from mock-bot-id filename=failure.diff
    128 MOCK bug comment: bug_id=42, cc=None
     127MOCK add_attachment_to_bug: bug_id=50004, description=Failure diff from mock-bot-id filename=failure.diff
     128MOCK bug comment: bug_id=50000, cc=None
    129129--- Begin comment ---
    130 The dummy-queue encountered the following flaky tests while processing attachment 197:
     130The dummy-queue encountered the following flaky tests while processing attachment 10000:
    131131
    132 foo/bar.html bug 78 (author: abarth@webkit.org)
     132foo/bar.html bug 50004 (author: abarth@webkit.org)
    133133The dummy-queue is continuing to process your patch.
    134134--- End comment ---

  • trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py

    r95500 r95543  
    7272
    7373        # MockBugzilla has a create_bug, but it logs to stderr, this avoids any logging.
    74         tool.bugs.create_bug = lambda a, b, cc=None, assignee=None: 78
    75         self.assertEquals("tom: Created bug: http://example.com/78",
     74        tool.bugs.create_bug = lambda a, b, cc=None, assignee=None: 50004
     75        self.assertEquals("tom: Created bug: http://example.com/50004",
    7676                          create_bug.execute("tom", example_args, tool, None))
    7777

  • trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py

    r91210 r95543  
    6161        tool = MockTool()
    6262        reader = LayoutTestResultsReader(tool, "/var/logs")
    63         patch = tool.bugs.fetch_attachment(128)
     63        patch = tool.bugs.fetch_attachment(10001)
    6464        tool.filesystem = MockFileSystem()
    6565        # Should fail because the results_directory does not exist.

  • trunk/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py

    r89868 r95543  
    8686        self.record("should_proceed_with_work_item")
    8787        self._test.assertEquals(work_item, "work_item")
    88         fake_patch = { 'bug_id' : 42 }
     88        fake_patch = {'bug_id': 50000}
    8989        return (True, "waiting_message", fake_patch)
    9090

  • trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

    r94978 r95543  
    4343        output = OutputCapture()
    4444
    45         expected_stderr = "Preparing rollout for bug 42.\n"
     45        expected_stderr = "Preparing rollout for bug 50000.\n"
    4646        commit_info = output.assert_outputs(self, command._commit_info, [1234], expected_stderr=expected_stderr)
    4747        self.assertTrue(commit_info)
    … …  
    9696        options.update = True
    9797        options.local_commit = True
    98         expected_stderr = "Updating working directory\nProcessing 1 patch from 1 bug.\nProcessing patch 197 from bug 42.\n"
    99         self.assert_execute_outputs(ApplyAttachment(), [197], options=options, expected_stderr=expected_stderr)
     98        expected_stderr = "Updating working directory\nProcessing 1 patch from 1 bug.\nProcessing patch 10000 from bug 50000.\n"
     99        self.assert_execute_outputs(ApplyAttachment(), [10000], options=options, expected_stderr=expected_stderr)
    100100
    101101    def test_apply_patches(self):
    … …  
    103103        options.update = True
    104104        options.local_commit = True
    105         expected_stderr = "Updating working directory\n2 reviewed patches found on bug 42.\nProcessing 2 patches from 1 bug.\nProcessing patch 197 from bug 42.\nProcessing patch 128 from bug 42.\n"
    106         self.assert_execute_outputs(ApplyFromBug(), [42], options=options, expected_stderr=expected_stderr)
     105        expected_stderr = "Updating working directory\n2 reviewed patches found on bug 50000.\nProcessing 2 patches from 1 bug.\nProcessing patch 10000 from bug 50000.\nProcessing patch 10001 from bug 50000.\n"
     106        self.assert_execute_outputs(ApplyFromBug(), [50000], options=options, expected_stderr=expected_stderr)
    107107
    108108    def test_land(self):
    109         expected_stderr = "Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 42\n"
     109        expected_stderr = "Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 50000\n"
    110110        mock_tool = MockTool()
    111111        mock_tool.scm().create_patch = Mock(return_value="Patch1\nMockPatch\n")
    112112        mock_tool.checkout().modified_changelogs = Mock(return_value=[])
    113         self.assert_execute_outputs(Land(), [42], options=self._default_options(), expected_stderr=expected_stderr, tool=mock_tool)
     113        self.assert_execute_outputs(Land(), [50000], options=self._default_options(), expected_stderr=expected_stderr, tool=mock_tool)
    114114        # Make sure we're not calling expensive calls too often.
    115115        self.assertEqual(mock_tool.scm().create_patch.call_count, 0)
    … …  
    117117
    118118    def test_land_red_builders(self):
    119         expected_stderr = 'Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 42\n'
     119        expected_stderr = 'Building WebKit\nRunning Python unit tests\nRunning Perl unit tests\nRunning Bindings tests\nRunning JavaScriptCore tests\nRunning run-webkit-tests\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nUpdating bug 50000\n'
    120120        mock_tool = MockTool()
    121121        mock_tool.buildbot.light_tree_on_fire()
    122         self.assert_execute_outputs(Land(), [42], options=self._default_options(), expected_stderr=expected_stderr, tool=mock_tool)
     122        self.assert_execute_outputs(Land(), [50000], options=self._default_options(), expected_stderr=expected_stderr, tool=mock_tool)
    123123
    124124    def test_check_style(self):
    … …  
    126126Updating working directory
    127127MOCK run_and_throw_if_fail: ['mock-update-webkit'], cwd=/mock-checkout
    128 Processing patch 197 from bug 42.
     128Processing patch 10000 from bug 50000.
    129129MOCK run_and_throw_if_fail: ['mock-check-webkit-style', '--git-commit', 'MOCK git commit', '--diff-files', 'MockFile1'], cwd=/mock-checkout
    130130"""
    131         self.assert_execute_outputs(CheckStyle(), [197], options=self._default_options(), expected_stderr=expected_stderr, tool=MockTool(log_executive=True))
     131        self.assert_execute_outputs(CheckStyle(), [10000], options=self._default_options(), expected_stderr=expected_stderr, tool=MockTool(log_executive=True))
    132132
    133133    def test_build_attachment(self):
    134         expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nBuilding WebKit\n"
    135         self.assert_execute_outputs(BuildAttachment(), [197], options=self._default_options(), expected_stderr=expected_stderr)
     134        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 10000 from bug 50000.\nBuilding WebKit\n"
     135        self.assert_execute_outputs(BuildAttachment(), [10000], options=self._default_options(), expected_stderr=expected_stderr)
    136136
    137137    def test_land_attachment(self):
    … …  
    139139        expected_stderr = """Processing 1 patch from 1 bug.
    140140Updating working directory
    141 Processing patch 197 from bug 42.
     141Processing patch 10000 from bug 50000.
    142142Building WebKit
    143143Running Python unit tests
    … …  
    147147Running run-webkit-tests
    148148Committed r49824: <http://trac.webkit.org/changeset/49824>
    149 Not closing bug 42 as attachment 197 has review=+.  Assuming there are more patches to land from this bug.
    150 """
    151         self.assert_execute_outputs(LandAttachment(), [197], options=self._default_options(), expected_stderr=expected_stderr)
     149Not closing bug 50000 as attachment 10000 has review=+.  Assuming there are more patches to land from this bug.
     150"""
     151        self.assert_execute_outputs(LandAttachment(), [10000], options=self._default_options(), expected_stderr=expected_stderr)
    152152
    153153    def test_land_patches(self):
    154154        # FIXME: This expected result is imperfect, notice how it's seeing the same patch as still there after it thought it would have cleared the flags.
    155         expected_stderr = """2 reviewed patches found on bug 42.
     155        expected_stderr = """2 reviewed patches found on bug 50000.
    156156Processing 2 patches from 1 bug.
    157157Updating working directory
    158 Processing patch 197 from bug 42.
     158Processing patch 10000 from bug 50000.
    159159Building WebKit
    160160Running Python unit tests
    … …  
    164164Running run-webkit-tests
    165165Committed r49824: <http://trac.webkit.org/changeset/49824>
    166 Not closing bug 42 as attachment 197 has review=+.  Assuming there are more patches to land from this bug.
    167 Updating working directory
    168 Processing patch 128 from bug 42.
     166Not closing bug 50000 as attachment 10000 has review=+.  Assuming there are more patches to land from this bug.
     167Updating working directory
     168Processing patch 10001 from bug 50000.
    169169Building WebKit
    170170Running Python unit tests
    … …  
    174174Running run-webkit-tests
    175175Committed r49824: <http://trac.webkit.org/changeset/49824>
    176 Not closing bug 42 as attachment 197 has review=+.  Assuming there are more patches to land from this bug.
    177 """
    178         self.assert_execute_outputs(LandFromBug(), [42], options=self._default_options(), expected_stderr=expected_stderr)
     176Not closing bug 50000 as attachment 10000 has review=+.  Assuming there are more patches to land from this bug.
     177"""
     178        self.assert_execute_outputs(LandFromBug(), [50000], options=self._default_options(), expected_stderr=expected_stderr)
    179179
    180180    def test_prepare_rollout(self):
    181         expected_stderr = "Preparing rollout for bug 42.\nUpdating working directory\n"
     181        expected_stderr = "Preparing rollout for bug 50000.\nUpdating working directory\n"
    182182        self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
    183183
    184184    def test_create_rollout(self):
    185         expected_stderr = """Preparing rollout for bug 42.
     185        expected_stderr = """Preparing rollout for bug 50000.
    186186Updating working directory
    187187MOCK create_bug
    … …  
    191191component: MOCK component
    192192cc: MOCK cc
    193 blocked: 42
    194 MOCK add_patch_to_bug: bug_id=78, description=ROLLOUT of r852, mark_for_review=False, mark_for_commit_queue=True, mark_for_landing=False
     193blocked: 50000
     194MOCK add_patch_to_bug: bug_id=50004, description=ROLLOUT of r852, mark_for_review=False, mark_for_commit_queue=True, mark_for_landing=False
    195195-- Begin comment --
    196196Any committer can land this patch automatically by marking it commit-queue+.  The commit-queue will build and test the patch before landing to ensure that the rollout will be successful.  This process takes approximately 15 minutes.
    … …  
    207207
    208208    def test_rollout(self):
    209         expected_stderr = """Preparing rollout for bug 42.
     209        expected_stderr = """Preparing rollout for bug 50000.
    210210Updating working directory
    211211MOCK: user.open_url: file://...

  • trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py

    r91210 r95543  
    4949        ews._expected_failures.unexpected_failures_observed = lambda results: set(["foo.html", "bar.html"])
    5050        task = Mock()
    51         patch = ews._tool.bugs.fetch_attachment(197)
     51        patch = ews._tool.bugs.fetch_attachment(10000)
    5252        self.assertEqual(ews._failing_tests_message(task, patch), "New failing tests:\nbar.html\nfoo.html")
    5353
    … …  
    6363            "handle_unexpected_error": "Mock error message\n",
    6464            "next_work_item": "",
    65             "process_work_item": "MOCK: update_status: %(name)s Pass\nMOCK: release_work_item: %(name)s 197\n" % string_replacemnts,
     65            "process_work_item": "MOCK: update_status: %(name)s Pass\nMOCK: release_work_item: %(name)s 10000\n" % string_replacemnts,
    6666            "handle_script_error": "ScriptError error message\n",
    6767        }
    … …  
    7676        expected_stderr = self._default_expected_stderr(ews)
    7777        string_replacemnts = {"name": ews.name}
    78         expected_stderr["process_work_item"] = "MOCK: update_status: %(name)s Error: %(name)s cannot process patches from non-committers :(\nMOCK: release_work_item: %(name)s 197\n" % string_replacemnts
     78        expected_stderr["process_work_item"] = "MOCK: update_status: %(name)s Error: %(name)s cannot process patches from non-committers :(\nMOCK: release_work_item: %(name)s 10000\n" % string_replacemnts
    7979        self.assert_queue_outputs(ews, expected_stderr=expected_stderr)
    8080

  • trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py

    r68766 r95543  
    3838class QueryCommandsTest(CommandsTest):
    3939    def test_bugs_to_commit(self):
    40         expected_stderr = "Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)\n"
    41         self.assert_execute_outputs(BugsToCommit(), None, "42\n77\n", expected_stderr)
     40        expected_stderr = "Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com)\n"
     41        self.assert_execute_outputs(BugsToCommit(), None, "50000\n50003\n", expected_stderr)
    4242
    4343    def test_patches_in_commit_queue(self):
    44         expected_stdout = "http://example.com/197\nhttp://example.com/103\n"
    45         expected_stderr = "Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)\nPatches in commit queue:\n"
     44        expected_stdout = "http://example.com/10000\nhttp://example.com/10002\n"
     45        expected_stderr = "Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com)\nPatches in commit queue:\n"
    4646        self.assert_execute_outputs(PatchesInCommitQueue(), None, expected_stdout, expected_stderr)
    4747
    4848    def test_patches_to_commit_queue(self):
    49         expected_stdout = "http://example.com/104&action=edit\n"
    50         expected_stderr = "197 already has cq=+\n128 already has cq=+\n105 committer = \"Eric Seidel\" <eric@webkit.org>\n"
     49        expected_stdout = "http://example.com/10003&action=edit\n"
     50        expected_stderr = "10000 already has cq=+\n10001 already has cq=+\n10004 committer = \"Eric Seidel\" <eric@webkit.org>\n"
    5151        options = Mock()
    5252        options.bugs = False
    5353        self.assert_execute_outputs(PatchesToCommitQueue(), None, expected_stdout, expected_stderr, options=options)
    5454
    55         expected_stdout = "http://example.com/77\n"
     55        expected_stdout = "http://example.com/50003\n"
    5656        options.bugs = True
    5757        self.assert_execute_outputs(PatchesToCommitQueue(), None, expected_stdout, expected_stderr, options=options)
    5858
    5959    def test_patches_to_review(self):
    60         expected_stdout = "103\n"
     60        expected_stdout = "10002\n"
    6161        expected_stderr = "Patches pending review:\n"
    6262        self.assert_execute_outputs(PatchesToReview(), None, expected_stdout, expected_stderr)

  • trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py

    r94978 r95543  
    139139            "should_proceed_with_work_item": "",
    140140            "next_work_item": "",
    141             "process_work_item": """Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)
    142 Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)
    143 MOCK setting flag 'commit-queue' to '-' on attachment '128' with comment 'Rejecting attachment 128 from commit-queue.' and additional comment 'non-committer@example.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.
     141            "process_work_item": """Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com)
     142Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com)
     143MOCK setting flag 'commit-queue' to '-' on attachment '10001' with comment 'Rejecting attachment 10001 from commit-queue.' and additional comment 'non-committer@example.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py.
    144144
    145145- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.
    146146
    147147- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.'
    148 MOCK: update_work_items: commit-queue [106, 197]
    149 Feeding commit-queue items [106, 197]
     148MOCK: update_work_items: commit-queue [10005, 10000]
     149Feeding commit-queue items [10005, 10000]
    150150Feeding EWS (1 r? patch, 1 new)
    151 MOCK: submit_to_ews: 103
     151MOCK: submit_to_ews: 10002
    152152""",
    153153            "handle_unexpected_error": "Mock error message\n",
    … …  
    164164        queue._options.port = None
    165165        self.assertEquals(queue._next_patch(), None)
    166         tool.status_server = MockStatusServer(work_items=[2, 197])
     166        tool.status_server = MockStatusServer(work_items=[2, 10000])
    167167        expected_stdout = "MOCK: fetch_attachment: 2 is not a known attachment id\n"  # A mock-only message to prevent us from making mistakes.
    168168        expected_stderr = "MOCK: release_work_item: None 2\n"
    169169        patch_id = OutputCapture().assert_outputs(self, queue._next_patch, expected_stdout=expected_stdout, expected_stderr=expected_stderr)
    170170        self.assertEquals(patch_id, None)  # 2 is an invalid patch id
    171         self.assertEquals(queue._next_patch().id(), 197)
     171        self.assertEquals(queue._next_patch().id(), 10000)
    172172
    173173    def test_upload_results_archive_for_patch(self):
    … …  
    178178        queue._options = Mock()
    179179        queue._options.port = None
    180         patch = queue._tool.bugs.fetch_attachment(128)
    181         expected_stderr = """MOCK add_attachment_to_bug: bug_id=42, description=Archive of layout-test-results from bot filename=layout-test-results.zip
     180        patch = queue._tool.bugs.fetch_attachment(10001)
     181        expected_stderr = """MOCK add_attachment_to_bug: bug_id=50000, description=Archive of layout-test-results from bot filename=layout-test-results.zip
    182182-- Begin comment --
    183183The attached test failures were seen while running run-webkit-tests on the mock-queue.
    … …  
    247247MOCK: update_status: commit-queue Landed patch
    248248MOCK: update_status: commit-queue Pass
    249 MOCK: release_work_item: commit-queue 197
     249MOCK: release_work_item: commit-queue 10000
    250250""",
    251             "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting attachment 197 from commit-queue.' and additional comment 'Mock error message'\n",
     251            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '10000' with comment 'Rejecting attachment 10000 from commit-queue.' and additional comment 'Mock error message'\n",
    252252            "handle_script_error": "ScriptError error message\n",
    253253        }
    … …  
    262262MOCK: update_status: commit-queue Updated working directory
    263263MOCK: update_status: commit-queue Patch does not apply
    264 MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting attachment 197 from commit-queue.' and additional comment 'MOCK script error'
     264MOCK setting flag 'commit-queue' to '-' on attachment '10000' with comment 'Rejecting attachment 10000 from commit-queue.' and additional comment 'MOCK script error'
    265265MOCK: update_status: commit-queue Fail
    266 MOCK: release_work_item: commit-queue 197
     266MOCK: release_work_item: commit-queue 10000
    267267""",
    268             "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting attachment 197 from commit-queue.' and additional comment 'Mock error message'\n",
     268            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '10000' with comment 'Rejecting attachment 10000 from commit-queue.' and additional comment 'Mock error message'\n",
    269269            "handle_script_error": "ScriptError error message\n",
    270270        }
    … …  
    293293MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'update'], cwd=/mock-checkout
    294294MOCK: update_status: commit-queue Updated working directory
    295 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 197], cwd=/mock-checkout
     295MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 10000], cwd=/mock-checkout
    296296MOCK: update_status: commit-queue Applied patch
    297297MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build', '--no-clean', '--no-update', '--build-style=both'], cwd=/mock-checkout
    … …  
    299299MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive'], cwd=/mock-checkout
    300300MOCK: update_status: commit-queue Passed tests
    301 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 197], cwd=/mock-checkout
     301MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000], cwd=/mock-checkout
    302302MOCK: update_status: commit-queue Landed patch
    303303MOCK: update_status: commit-queue Pass
    304 MOCK: release_work_item: commit-queue 197
     304MOCK: release_work_item: commit-queue 10000
    305305""",
    306             "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting attachment 197 from commit-queue.' and additional comment 'Mock error message'\n",
     306            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '10000' with comment 'Rejecting attachment 10000 from commit-queue.' and additional comment 'Mock error message'\n",
    307307            "handle_script_error": "ScriptError error message\n",
    308308        }
    … …  
    312312        tool = MockTool(log_executive=True)
    313313        tool.buildbot.light_tree_on_fire()
    314         rollout_patch = tool.bugs.fetch_attachment(106)  # _patch6, a rollout patch.
     314        rollout_patch = tool.bugs.fetch_attachment(10005)  # _patch6, a rollout patch.
    315315        assert(rollout_patch.is_rollout())
    316316        expected_stderr = {
    … …  
    322322MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'update'], cwd=/mock-checkout
    323323MOCK: update_status: commit-queue Updated working directory
    324 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 106], cwd=/mock-checkout
     324MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'apply-attachment', '--no-update', '--non-interactive', 10005], cwd=/mock-checkout
    325325MOCK: update_status: commit-queue Applied patch
    326 MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 106], cwd=/mock-checkout
     326MOCK run_and_throw_if_fail: ['echo', '--status-host=example.com', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10005], cwd=/mock-checkout
    327327MOCK: update_status: commit-queue Landed patch
    328328MOCK: update_status: commit-queue Pass
    329 MOCK: release_work_item: commit-queue 106
     329MOCK: release_work_item: commit-queue 10005
    330330""",
    331             "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '106' with comment 'Rejecting attachment 106 from commit-queue.' and additional comment 'Mock error message'\n",
     331            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '10005' with comment 'Rejecting attachment 10005 from commit-queue.' and additional comment 'Mock error message'\n",
    332332            "handle_script_error": "ScriptError error message\n",
    333333        }
    … …  
    361361MOCK: update_status: commit-queue Passed tests
    362362MOCK: update_status: commit-queue Retry
    363 MOCK: release_work_item: commit-queue 197
     363MOCK: release_work_item: commit-queue 10000
    364364"""
    365365        OutputCapture().assert_outputs(self, queue.process_work_item, [QueuesTest.mock_work_item], expected_stderr=expected_stderr)
    … …  
    367367    def test_report_flaky_tests(self):
    368368        queue = TestCommitQueue(MockTool())
    369         expected_stderr = """MOCK bug comment: bug_id=76, cc=None
     369        expected_stderr = """MOCK bug comment: bug_id=50002, cc=None
    370370--- Begin comment ---
    371 The commit-queue just saw foo/bar.html flake (Text diff mismatch) while processing attachment 197 on bug 42.
     371The commit-queue just saw foo/bar.html flake (Text diff mismatch) while processing attachment 10000 on bug 50000.
    372372Port: MockPort  Platform: MockPlatform 1.0
    373373--- End comment ---
    374374
    375 MOCK add_attachment_to_bug: bug_id=76, description=Failure diff from bot filename=failure.diff
    376 MOCK bug comment: bug_id=76, cc=None
     375MOCK add_attachment_to_bug: bug_id=50002, description=Failure diff from bot filename=failure.diff
     376MOCK bug comment: bug_id=50002, cc=None
    377377--- Begin comment ---
    378 The commit-queue just saw bar/baz.html flake (Text diff mismatch) while processing attachment 197 on bug 42.
     378The commit-queue just saw bar/baz.html flake (Text diff mismatch) while processing attachment 10000 on bug 50000.
    379379Port: MockPort  Platform: MockPlatform 1.0
    380380--- End comment ---
    381381
    382 MOCK add_attachment_to_bug: bug_id=76, description=Archive of layout-test-results from bot filename=layout-test-results.zip
    383 MOCK bug comment: bug_id=42, cc=None
     382MOCK add_attachment_to_bug: bug_id=50002, description=Archive of layout-test-results from bot filename=layout-test-results.zip
     383MOCK bug comment: bug_id=50000, cc=None
    384384--- Begin comment ---
    385 The commit-queue encountered the following flaky tests while processing attachment 197:
    386 
    387 foo/bar.html bug 76 (author: abarth@webkit.org)
    388 bar/baz.html bug 76 (author: abarth@webkit.org)
     385The commit-queue encountered the following flaky tests while processing attachment 10000:
     386
     387foo/bar.html bug 50002 (author: abarth@webkit.org)
     388bar/baz.html bug 50002 (author: abarth@webkit.org)
    389389The commit-queue is continuing to process your patch.
    390390--- End comment ---
    … …  
    414414            "next_work_item": "",
    415415            "should_proceed_with_work_item": "MOCK: update_status: style-queue Checking style\n",
    416             "process_work_item": "MOCK: update_status: style-queue Pass\nMOCK: release_work_item: style-queue 197\n",
     416            "process_work_item": "MOCK: update_status: style-queue Pass\nMOCK: release_work_item: style-queue 10000\n",
    417417            "handle_unexpected_error": "Mock error message\n",
    418             "handle_script_error": "MOCK: update_status: style-queue ScriptError error message\nMOCK bug comment: bug_id=42, cc=[]\n--- Begin comment ---\nAttachment 197 did not pass style-queue:\n\nScriptError error message\n\nIf any of these errors are false positives, please file a bug against check-webkit-style.\n--- End comment ---\n\n",
     418            "handle_script_error": "MOCK: update_status: style-queue ScriptError error message\nMOCK bug comment: bug_id=50000, cc=[]\n--- Begin comment ---\nAttachment 10000 did not pass style-queue:\n\nScriptError error message\n\nIf any of these errors are false positives, please file a bug against check-webkit-style.\n--- End comment ---\n\n",
    419419        }
    420420        expected_exceptions = {

  • trunk/Tools/Scripts/webkitpy/tool/commands/queuestest.py

    r91210 r95543  
    4747class QueuesTest(unittest.TestCase):
    4848    # This is _patch1 in mocktool.py
    49     mock_work_item = MockTool().bugs.fetch_attachment(197)
     49    mock_work_item = MockTool().bugs.fetch_attachment(10000)
    5050
    5151    def assert_outputs(self, func, func_name, args, expected_stdout, expected_stderr, expected_exceptions):

  • trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py

    r84575 r95543  
    4343    def test_assign_to_committer(self):
    4444        tool = MockTool()
    45         expected_stderr = """Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)
    46 MOCK reassign_bug: bug_id=42, assignee=eric@webkit.org
     45        expected_stderr = """Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com)
     46MOCK reassign_bug: bug_id=50000, assignee=eric@webkit.org
    4747-- Begin comment --
    48 Attachment 128 was posted by a committer and has review+, assigning to Eric Seidel for commit.
     48Attachment 10001 was posted by a committer and has review+, assigning to Eric Seidel for commit.
    4949-- End comment --
    50 Bug 77 is already assigned to foo@foo.com (None).
    51 Bug 76 has no non-obsolete patches, ignoring.
     50Bug 50003 is already assigned to foo@foo.com (None).
     51Bug 50002 has no non-obsolete patches, ignoring.
    5252"""
    5353        self.assert_execute_outputs(AssignToCommitter(), [], expected_stderr=expected_stderr, tool=tool)
    5454
    5555    def test_obsolete_attachments(self):
    56         expected_stderr = "Obsoleting 2 old patches on bug 42\n"
    57         self.assert_execute_outputs(ObsoleteAttachments(), [42], expected_stderr=expected_stderr)
     56        expected_stderr = "Obsoleting 2 old patches on bug 50000\n"
     57        self.assert_execute_outputs(ObsoleteAttachments(), [50000], expected_stderr=expected_stderr)
    5858
    5959    def test_post(self):
    … …  
    6868        expected_stderr = """MOCK: user.open_url: file://...
    6969Was that diff correct?
    70 Obsoleting 2 old patches on bug 42
    71 MOCK reassign_bug: bug_id=42, assignee=None
    72 MOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
    73 MOCK: user.open_url: http://example.com/42
     70Obsoleting 2 old patches on bug 50000
     71MOCK reassign_bug: bug_id=50000, assignee=None
     72MOCK add_patch_to_bug: bug_id=50000, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
     73MOCK: user.open_url: http://example.com/50000
    7474"""
    75         self.assert_execute_outputs(Post(), [42], options=options, expected_stderr=expected_stderr)
     75        self.assert_execute_outputs(Post(), [50000], options=options, expected_stderr=expected_stderr)
    7676
    7777    def test_attach_to_bug(self):
    … …  
    7979        options.comment = "extra comment"
    8080        options.description = "file description"
    81         expected_stderr = """MOCK add_attachment_to_bug: bug_id=42, description=file description filename=None
     81        expected_stderr = """MOCK add_attachment_to_bug: bug_id=50000, description=file description filename=None
    8282-- Begin comment --
    8383extra comment
    8484-- End comment --
    8585"""
    86         self.assert_execute_outputs(AttachToBug(), [42, "path/to/file.txt", "file description"], options=options, expected_stderr=expected_stderr)
     86        self.assert_execute_outputs(AttachToBug(), [50000, "path/to/file.txt", "file description"], options=options, expected_stderr=expected_stderr)
    8787
    8888    def test_attach_to_bug_no_description_or_comment(self):
    … …  
    9090        options.comment = None
    9191        options.description = None
    92         expected_stderr = """MOCK add_attachment_to_bug: bug_id=42, description=file.txt filename=None
     92        expected_stderr = """MOCK add_attachment_to_bug: bug_id=50000, description=file.txt filename=None
    9393"""
    94         self.assert_execute_outputs(AttachToBug(), [42, "path/to/file.txt"], options=options, expected_stderr=expected_stderr)
     94        self.assert_execute_outputs(AttachToBug(), [50000, "path/to/file.txt"], options=options, expected_stderr=expected_stderr)
    9595
    9696    def test_land_safely(self):
    97         expected_stderr = "Obsoleting 2 old patches on bug 42\nMOCK add_patch_to_bug: bug_id=42, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True\n"
    98         self.assert_execute_outputs(LandSafely(), [42], expected_stderr=expected_stderr)
     97        expected_stderr = "Obsoleting 2 old patches on bug 50000\nMOCK add_patch_to_bug: bug_id=50000, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True\n"
     98        self.assert_execute_outputs(LandSafely(), [50000], expected_stderr=expected_stderr)
    9999
    100100    def test_prepare_diff_with_arg(self):
    101         self.assert_execute_outputs(Prepare(), [42])
     101        self.assert_execute_outputs(Prepare(), [50000])
    102102
    103103    def test_prepare(self):
    … …  
    116116        expected_stderr = """MOCK: user.open_url: file://...
    117117Was that diff correct?
    118 Obsoleting 2 old patches on bug 42
    119 MOCK reassign_bug: bug_id=42, assignee=None
    120 MOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
    121 MOCK: user.open_url: http://example.com/42
     118Obsoleting 2 old patches on bug 50000
     119MOCK reassign_bug: bug_id=50000, assignee=None
     120MOCK add_patch_to_bug: bug_id=50000, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
     121MOCK: user.open_url: http://example.com/50000
    122122"""
    123         self.assert_execute_outputs(Upload(), [42], options=options, expected_stderr=expected_stderr)
     123        self.assert_execute_outputs(Upload(), [50000], options=options, expected_stderr=expected_stderr)
    124124
    125125    def test_mark_bug_fixed(self):
    … …  
    127127        tool._scm.last_svn_commit_log = lambda: "r9876 |"
    128128        options = Mock()
    129         options.bug_id = 42
     129        options.bug_id = 50000
    130130        options.comment = "MOCK comment"
    131         expected_stderr = """Bug: <http://example.com/42> Bug with two r+'d and cq+'d patches, one of which has an invalid commit-queue setter.
     131        expected_stderr = """Bug: <http://example.com/50000> Bug with two r+'d and cq+'d patches, one of which has an invalid commit-queue setter.
    132132Revision: 9876
    133 MOCK: user.open_url: http://example.com/42
     133MOCK: user.open_url: http://example.com/50000
    134134Is this correct?
    135 Adding comment to Bug 42.
    136 MOCK bug comment: bug_id=42, cc=None
     135Adding comment to Bug 50000.
     136MOCK bug comment: bug_id=50000, cc=None
    137137--- Begin comment ---
    138138MOCK comment

  • trunk/Tools/Scripts/webkitpy/tool/mocktool.py

    r95257 r95543  
    4848# Testing
    4949
    50 # FIXME: The ids should be 1, 2, 3 instead of crazy numbers.
    51 
    5250
    5351_patch1 = {
    54     "id": 197,
    55     "bug_id": 42,
    56     "url": "http://example.com/197",
     52    "id": 10000,
     53    "bug_id": 50000,
     54    "url": "http://example.com/10000",
    5755    "name": "Patch1",
    5856    "is_obsolete": False,
    … …  
    6765
    6866_patch2 = {
    69     "id": 128,
    70     "bug_id": 42,
    71     "url": "http://example.com/128",
     67    "id": 10001,
     68    "bug_id": 50000,
     69    "url": "http://example.com/10001",
    7270    "name": "Patch2",
    7371    "is_obsolete": False,
    … …  
    8280
    8381_patch3 = {
    84     "id": 103,
    85     "bug_id": 75,
    86     "url": "http://example.com/103",
     82    "id": 10002,
     83    "bug_id": 50001,
     84    "url": "http://example.com/10002",
    8785    "name": "Patch3",
    8886    "is_obsolete": False,
    … …  
    9492
    9593_patch4 = {
    96     "id": 104,
    97     "bug_id": 77,
    98     "url": "http://example.com/103",
     94    "id": 10003,
     95    "bug_id": 50003,
     96    "url": "http://example.com/10002",
    9997    "name": "Patch3",
    10098    "is_obsolete": False,
    … …  
    108106
    109107_patch5 = {
    110     "id": 105,
    111     "bug_id": 77,
    112     "url": "http://example.com/103",
     108    "id": 10004,
     109    "bug_id": 50003,
     110    "url": "http://example.com/10002",
    113111    "name": "Patch5",
    114112    "is_obsolete": False,
    … …  
    121119
    122120_patch6 = { # Valid committer, but no reviewer.
    123     "id": 106,
    124     "bug_id": 77,
    125     "url": "http://example.com/103",
     121    "id": 10005,
     122    "bug_id": 50003,
     123    "url": "http://example.com/10002",
    126124    "name": "ROLLOUT of r3489",
    127125    "is_obsolete": False,
    … …  
    134132
    135133_patch7 = { # Valid review, patch is marked obsolete.
    136     "id": 107,
    137     "bug_id": 76,
    138     "url": "http://example.com/103",
     134    "id": 10006,
     135    "bug_id": 50002,
     136    "url": "http://example.com/10002",
    139137    "name": "Patch7",
    140138    "is_obsolete": True,
    … …  
    153151
    154152
    155 # FIXME: The ids should be 1, 2, 3 instead of crazy numbers.
    156 
    157 
    158153_bug1 = {
    159     "id": 42,
     154    "id": 50000,
    160155    "title": "Bug with two r+'d and cq+'d patches, one of which has an "
    161156             "invalid commit-queue setter.",
    … …  
    168163
    169164_bug2 = {
    170     "id": 75,
     165    "id": 50001,
    171166    "title": "Bug with a patch needing review.",
    172167    "reporter_email": "foo@foo.com",
    … …  
    178173
    179174_bug3 = {
    180     "id": 76,
     175    "id": 50002,
    181176    "title": "The third bug",
    182177    "reporter_email": "foo@foo.com",
    … …  
    188183
    189184_bug4 = {
    190     "id": 77,
     185    "id": 50003,
    191186    "title": "The fourth bug",
    192187    "reporter_email": "foo@foo.com",
    … …  
    198193
    199194_bug5 = {
    200     "id": 78,
     195    "id": 50004,
    201196    "title": "The fifth bug",
    202197    "reporter_email": _commit_queue_email,
    … …  
    204199    "attachments": [],
    205200    "bug_status": "RESOLVED",
    206     "dup_id": 76,
     201    "dup_id": 50002,
    207202}
    208203
    … …  
    239234        # test_assign_to_committer the real pending-commit query on bugzilla
    240235        # will return bugs with patches which have r+, but are also obsolete.
    241         return bug_ids + [76]
     236        return bug_ids + [50002]
    242237
    243238    def fetch_patches_from_pending_commit_list(self):
    … …  
    245240
    246241    def fetch_bugs_matching_search(self, search_string, author_email=None):
    247         return [self._bugzilla.fetch_bug(78), self._bugzilla.fetch_bug(77)]
     242        return [self._bugzilla.fetch_bug(50004), self._bugzilla.fetch_bug(50003)]
    248243
    249244
    … …  
    293288        if blocked:
    294289            log("blocked: %s" % blocked)
    295         return 78
     290        return 50004
    296291
    297292    def quips(self):
    … …  
    539534        if commit_id == "Commitish1":
    540535            return CommitMessage("CommitMessage1\n" \
    541                 "https://bugs.example.org/show_bug.cgi?id=42\n")
     536                "https://bugs.example.org/show_bug.cgi?id=50000\n")
    542537        if commit_id == "Commitish2":
    543538            return CommitMessage("CommitMessage2\n" \
    544                 "https://bugs.example.org/show_bug.cgi?id=75\n")
     539                "https://bugs.example.org/show_bug.cgi?id=50001\n")
    545540        raise Exception("Bogus commit_id in commit_message_for_local_commit.")
    546541
    … …  
    585580            return None
    586581        return CommitInfo(svn_revision, "eric@webkit.org", {
    587             "bug_id": 42,
     582            "bug_id": 50000,
    588583            "author_name": "Adam Barth",
    589584            "author_email": "abarth@webkit.org",

  • trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py

    r91210 r95543  
    6464    def test_prompt_for_bug_or_title_step(self):
    6565        tool = MockTool()
    66         tool.user.prompt = lambda message: 42
     66        tool.user.prompt = lambda message: 50000
    6767        self._run_step(PromptForBugOrTitle, tool=tool)
    6868

  • trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py

    r95257 r95543  
    3737        capture = OutputCapture()
    3838        step = UpdateChangeLogsWithReviewer(MockTool(), MockOptions())
    39         expected_stderr = "No reviewed patches on bug 75, cannot infer reviewer.\n"
    40         capture.assert_outputs(self, step._guess_reviewer_from_bug, [75], expected_stderr=expected_stderr)
     39        expected_stderr = "No reviewed patches on bug 50001, cannot infer reviewer.\n"
     40        capture.assert_outputs(self, step._guess_reviewer_from_bug, [50001], expected_stderr=expected_stderr)
    4141
    4242    def test_guess_reviewer_from_multipatch_bug(self):
    4343        capture = OutputCapture()
    4444        step = UpdateChangeLogsWithReviewer(MockTool(), MockOptions())
    45         expected_stderr = "Guessing \"Reviewer2\" as reviewer from attachment 128 on bug 42.\n"
    46         capture.assert_outputs(self, step._guess_reviewer_from_bug, [42], expected_stderr=expected_stderr)
     45        expected_stderr = "Guessing \"Reviewer2\" as reviewer from attachment 10001 on bug 50000.\n"
     46        capture.assert_outputs(self, step._guess_reviewer_from_bug, [50000], expected_stderr=expected_stderr)
    4747
    4848    def test_empty_state(self):
Note: See TracChangeset for help on using the changeset viewer.