Changeset 223177 in webkit
- Timestamp:
- Oct 11, 2017 6:59:44 AM (7 years ago)
- Location:
- trunk/Tools
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r223167 r223177 1 2017-10-11 Tomas Popela <tpopela@redhat.com> 2 3 Use https for trac changeset and browser links 4 https://bugs.webkit.org/show_bug.cgi?id=178167 5 6 Reviewed by Alexey Proskuryakov. 7 8 Switch the http://trac.webkit.org/changeset and 9 http://trac.webkit.org/browser links that are printed by webkitpy to 10 https. Also update the test expectations. 11 12 * Scripts/webkitpy/common/checkout/checkout_unittest.py: 13 * Scripts/webkitpy/common/config/committervalidator_unittest.py: 14 (CommitterValidatorTest.test_flag_permission_rejection_message): 15 * Scripts/webkitpy/common/config/urls.py: 16 (view_source_url): 17 (view_revision_url): 18 * Scripts/webkitpy/common/net/bugzilla/bug_unittest.py: 19 (BugTest.test_commit_revision): 20 * Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py: 21 * Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py: 22 * Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py: 23 (MainTest): 24 (MainTest.test_run_with_upload_json_should_generate_perf_webkit_json): 25 * Scripts/webkitpy/style/checkers/changelog_unittest.py: 26 (ChangeLogCheckerTest.test_missing_bug_number): 27 * Scripts/webkitpy/tool/bot/feeders_unittest.py: 28 * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py: 29 * Scripts/webkitpy/tool/bot/ircbot_unittest.py: 30 (IRCBotTest.test_rollout): 31 (IRCBotTest.test_revert): 32 (IRCBotTest.test_multi_rollout): 33 (IRCBotTest.test_rollout_with_r_in_svn_revision): 34 (IRCBotTest.test_multi_rollout_with_r_in_svn_revision): 35 (IRCBotTest.test_rollout_invalidate_reason): 36 (test_multi_rollout_invalidate_reason): 37 * Scripts/webkitpy/tool/bot/sheriff_unittest.py: 38 * Scripts/webkitpy/tool/commands/download_unittest.py: 39 * Scripts/webkitpy/tool/commands/newcommitbot_unittest.py: 40 * Scripts/webkitpy/tool/commands/queues_unittest.py: 41 * Scripts/webkitpy/tool/commands/suggestnominations.py: 42 (SuggestNominations._count_commit): 43 * Scripts/webkitpy/tool/commands/upload_unittest.py: 44 * Scripts/webkitpy/tool/servers/data/rebaselineserver/util.js: 45 (getTracUrl): 46 (getSortedKeys): 47 * Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py: 48 (CloseBugForLandDiffTest.test_empty_state): 49 * Scripts/webkitpy/tool/steps/commit_unittest.py: 50 (CommitTest._test_check_test_expectations): 51 * Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py: 52 (UpdateChangeLogsForRevertTest): 53 1 54 2017-10-10 Ryosuke Niwa <rniwa@webkit.org> 2 55 -
trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py
r219483 r223177 122 122 123 123 "[Win] Build fix after r134209" 124 http ://trac.webkit.org/changeset/170340124 https://trac.webkit.org/changeset/170340 125 125 126 126 "[Win] Clean up and refactor WinLauncher" 127 127 https://bugs.webkit.org/show_bug.cgi?id=134209 128 http ://trac.webkit.org/changeset/170339128 https://trac.webkit.org/changeset/170339 129 129 """ 130 130 … … 287 287 288 288 "[Win] Build fix after r134209" 289 http ://trac.webkit.org/changeset/170340289 https://trac.webkit.org/changeset/170340 290 290 291 291 "[Win] Clean up and refactor WinLauncher" 292 292 https://bugs.webkit.org/show_bug.cgi?id=134209 293 http ://trac.webkit.org/changeset/170339293 https://trac.webkit.org/changeset/170339 294 294 295 295 Patch by Daniel Bates <dabates@apple.com> on 2014-06-23 … … 313 313 314 314 "[Win] Build fix after r134209" 315 http ://trac.webkit.org/changeset/170340315 https://trac.webkit.org/changeset/170340 316 316 317 317 "[Win] Clean up and refactor WinLauncher" 318 318 https://bugs.webkit.org/show_bug.cgi?id=134209 319 http ://trac.webkit.org/changeset/170339319 https://trac.webkit.org/changeset/170339 320 320 321 321 Patch by Daniel Bates <dabates@apple.com> on 2014-06-23 -
trunk/Tools/Scripts/webkitpy/common/config/committervalidator_unittest.py
r174136 r223177 37 37 validator = CommitterValidator(MockHost()) 38 38 self.assertEqual(validator._contributors_json_path(), "Tools/Scripts/webkitpy/common/config/contributors.json") 39 expected_messsage = """foo@foo.com does not have review permissions according to http ://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json.39 expected_messsage = """foo@foo.com does not have review permissions according to https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. 40 40 41 41 - If you do not have review rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. -
trunk/Tools/Scripts/webkitpy/common/config/urls.py
r202362 r223177 31 31 32 32 def view_source_url(local_path): 33 return "http ://trac.webkit.org/browser/trunk/%s" % local_path33 return "https://trac.webkit.org/browser/trunk/%s" % local_path 34 34 35 35 36 36 def view_revision_url(revision_number): 37 return "http ://trac.webkit.org/changeset/%s" % revision_number37 return "https://trac.webkit.org/changeset/%s" % revision_number 38 38 39 39 -
trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bug_unittest.py
r174136 r223177 58 58 59 59 bug = Bug({"comments": [ 60 {"text": "Committed r138776: <http ://trac.webkit.org/changeset/138776>"},60 {"text": "Committed r138776: <https://trac.webkit.org/changeset/138776>"}, 61 61 ]}, bugzilla=None) 62 62 self.assertEqual(bug.commit_revision(), 138776) 63 63 64 64 bug = Bug({"comments": [ 65 {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http ://trac.webkit.org/changeset/138776>"},65 {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <https://trac.webkit.org/changeset/138776>"}, 66 66 ]}, bugzilla=None) 67 67 self.assertEqual(bug.commit_revision(), 138776) … … 69 69 bug = Bug({"comments": [ 70 70 {"text": "Comment before"}, 71 {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http ://trac.webkit.org/changeset/138776>"},71 {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <https://trac.webkit.org/changeset/138776>"}, 72 72 {"text": "Comment after"}, 73 73 ]}, bugzilla=None) … … 76 76 bug = Bug({"comments": [ 77 77 {"text": "Comment before"}, 78 {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http ://trac.webkit.org/changeset/138776>"},78 {"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <https://trac.webkit.org/changeset/138776>"}, 79 79 {"text": "Comment Middle"}, 80 {"text": "(From update of attachment 181280) Clearing flags on attachment: 181280 Committed r138976: <http ://trac.webkit.org/changeset/138976>"},80 {"text": "(From update of attachment 181280) Clearing flags on attachment: 181280 Committed r138976: <https://trac.webkit.org/changeset/138976>"}, 81 81 {"text": "Comment After"}, 82 82 ]}, bugzilla=None) -
trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py
r220715 r223177 182 182 "comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 183 183 "comment_email": "bar@foo.com", 184 "text": "Message1.\nCommitted r35: <http ://trac.webkit.org/changeset/35>",184 "text": "Message1.\nCommitted r35: <https://trac.webkit.org/changeset/35>", 185 185 }, 186 186 ], … … 198 198 "comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 199 199 "comment_email": "bar@foo.com", 200 "text": "Committed r30: <http ://trac.webkit.org/changeset/30>",200 "text": "Committed r30: <https://trac.webkit.org/changeset/30>", 201 201 }, 202 202 {"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 203 203 "comment_email": "bar@foo.com", 204 "text": "Committed r31: <http ://trac.webkit.org/changeset/31>",204 "text": "Committed r31: <https://trac.webkit.org/changeset/31>", 205 205 }, 206 206 ], … … 218 218 "comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 219 219 "comment_email": "bar@foo.com", 220 "text": "Committed r25: <http ://trac.webkit.org/changeset/30>",220 "text": "Committed r25: <https://trac.webkit.org/changeset/30>", 221 221 }, 222 222 {"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 223 223 "comment_email": "bar@foo.com", 224 "text": "Rolled out in <http ://trac.webkit.org/changeset/26",224 "text": "Rolled out in <https://trac.webkit.org/changeset/26", 225 225 }, 226 226 ], … … 239 239 "comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 240 240 "comment_email": "bar@foo.com", 241 "text": "Committed r15: <http ://trac.webkit.org/changeset/15>",241 "text": "Committed r15: <https://trac.webkit.org/changeset/15>", 242 242 }, 243 243 ], … … 256 256 "comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 257 257 "comment_email": "bar@foo.com", 258 "text": "Committed r95: <http ://trac.webkit.org/changeset/95>",258 "text": "Committed r95: <https://trac.webkit.org/changeset/95>", 259 259 }, 260 260 ], … … 273 273 "comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3), 274 274 "comment_email": "bar@foo.com", 275 "text": "Message1.\nCommitted r105: <http ://trac.webkit.org/changeset/105>",275 "text": "Message1.\nCommitted r105: <https://trac.webkit.org/changeset/105>", 276 276 }, 277 277 ], -
trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py
r202362 r223177 335 335 <tr class="alt"> 336 336 <td>Jan 10 15:49</td> 337 <td><span class="revision" title="Revision 104643"><a href="http ://trac.webkit.org/changeset/104643">104643</a></span></td>337 <td><span class="revision" title="Revision 104643"><a href="https://trac.webkit.org/changeset/104643">104643</a></span></td> 338 338 <td class="success">failure</td> <td><a href=".../37604">#37604</a></td> 339 339 <td class="left">Build successful</td> … … 341 341 <tr class=""> 342 342 <td>Jan 10 15:32</td> 343 <td><span class="revision" title="Revision 104636"><a href="http ://trac.webkit.org/changeset/104636">104636</a></span></td>343 <td><span class="revision" title="Revision 104636"><a href="https://trac.webkit.org/changeset/104636">104636</a></span></td> 344 344 <td class="success">failure</td> <td><a href=".../37603">#37603</a></td> 345 345 <td class="left">Build successful</td> … … 347 347 <tr class="alt"> 348 348 <td>Jan 10 15:18</td> 349 <td><span class="revision" title="Revision 104635"><a href="http ://trac.webkit.org/changeset/104635">104635</a></span></td>349 <td><span class="revision" title="Revision 104635"><a href="https://trac.webkit.org/changeset/104635">104635</a></span></td> 350 350 <td class="success">success</td> <td><a href=".../37602">#37602</a></td> 351 351 <td class="left">Build successful</td> … … 353 353 <tr class=""> 354 354 <td>Jan 10 14:51</td> 355 <td><span class="revision" title="Revision 104633"><a href="http ://trac.webkit.org/changeset/104633">104633</a></span></td>355 <td><span class="revision" title="Revision 104633"><a href="https://trac.webkit.org/changeset/104633">104633</a></span></td> 356 356 <td class="failure">failure</td> <td><a href=".../37601">#37601</a></td> 357 357 <td class="left">Failed compile-webkit</td> … … 364 364 <tr class="alt"> 365 365 <td>Jan 10 15:49</td> 366 <td><span class="revision" title="Revision 104643"><a href="http ://trac.webkit.org/changeset/104643">104643</a></span></td>366 <td><span class="revision" title="Revision 104643"><a href="https://trac.webkit.org/changeset/104643">104643</a></span></td> 367 367 <td class="success">failure</td> 368 368 </tr> 369 369 <tr class=""> 370 370 <td>Jan 10 15:32</td> 371 <td><span class="revision" title="Revision 104636"><a href="http ://trac.webkit.org/changeset/104636">104636</a></span></td>371 <td><span class="revision" title="Revision 104636"><a href="https://trac.webkit.org/changeset/104636">104636</a></span></td> 372 372 <td class="success">failure</td> 373 373 </tr> 374 374 <tr class="alt"> 375 375 <td>Jan 10 15:18</td> 376 <td><span class="revision" title="Revision 104635"><a href="http ://trac.webkit.org/changeset/104635">104635</a></span></td>376 <td><span class="revision" title="Revision 104635"><a href="https://trac.webkit.org/changeset/104635">104635</a></span></td> 377 377 <td class="success">failure</td> 378 378 </tr> 379 379 <tr class=""> 380 380 <td>Jan 10 11:58</td> 381 <td><span class="revision" title="Revision ??"><a href="http ://trac.webkit.org/changeset/%3F%3F">??</a></span></td>381 <td><span class="revision" title="Revision ??"><a href="https://trac.webkit.org/changeset/%3F%3F">??</a></span></td> 382 382 <td class="retry">retry</td> 383 383 </tr> 384 384 <tr class=""> 385 385 <td>Jan 10 14:51</td> 386 <td><span class="revision" title="Revision 104633"><a href="http ://trac.webkit.org/changeset/104633">104633</a></span></td>386 <td><span class="revision" title="Revision 104633"><a href="https://trac.webkit.org/changeset/104633">104633</a></span></td> 387 387 <td class="failure">failure</td> 388 388 </tr> -
trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py
r202362 r223177 54 54 """ 55 55 56 results = {'url': 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html',56 results = {'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html', 57 57 'metrics': {'Time': {'current': [[1486.0, 1471.0, 1510.0, 1505.0, 1478.0, 1490.0]] * 4}}} 58 58 … … 69 69 """ 70 70 71 results = {'url': 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Parser/some-parser.html',71 results = {'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/some-parser.html', 72 72 'metrics': {'Time': {'current': [[1080.0, 1120.0, 1095.0, 1101.0, 1104.0]] * 4}}} 73 73 … … 111 111 """ 112 112 113 results = {'url': 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',113 results = {'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html', 114 114 'metrics': {'Time': {'current': [[1080.0, 1120.0, 1095.0, 1101.0, 1104.0]] * 4}}, 115 115 'tests': { 116 116 'subtest': { 117 'url': 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',117 'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html', 118 118 'metrics': {'Time': {'current': [[1.0, 2.0, 3.0, 4.0, 5.0]] * 4}}}, 119 119 'total-test': { 120 'url': 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',120 'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html', 121 121 'metrics': {'Time': {'current': [[1.0, 2.0, 3.0, 4.0, 5.0]] * 4, "aggregators": ["Total"]}}, 122 122 'tests': { 123 123 'subsubtest': 124 {'url': 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',124 {'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html', 125 125 'metrics': {'Time': {'current': [[1.0, 2.0, 3.0, 4.0, 5.0]] * 4}}}}}}} 126 126 … … 313 313 _event_target_wrapper_and_inspector_results = { 314 314 "Bindings": 315 {"url": "http ://trac.webkit.org/browser/trunk/PerformanceTests/Bindings",315 {"url": "https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings", 316 316 "tests": {"event-target-wrapper": EventTargetWrapperTestData.results}}, 317 317 "Parser": 318 {"url": "http ://trac.webkit.org/browser/trunk/PerformanceTests/Parser",318 {"url": "https://trac.webkit.org/browser/trunk/PerformanceTests/Parser", 319 319 "tests": {"some-parser": SomeParserTestData.results}}} 320 320 … … 512 512 self.assertEqual(output['tests'].keys(), ['Bindings', 'Parser']) 513 513 self.assertEqual(sorted(output['tests']['Bindings'].keys()), ['tests', 'url']) 514 self.assertEqual(output['tests']['Bindings']['url'], 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Bindings')514 self.assertEqual(output['tests']['Bindings']['url'], 'https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings') 515 515 self.assertEqual(output['tests']['Bindings']['tests'].keys(), ['event-target-wrapper']) 516 516 self.assertEqual(output['tests']['Bindings']['tests']['event-target-wrapper'], { 517 'url': 'http ://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html',517 'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html', 518 518 'metrics': {'Time': {'current': [[1486.0, 1471.0, 1510.0, 1505.0, 1478.0, 1490.0]] * 4}}}) 519 519 -
trunk/Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py
r219483 r223177 87 87 ' Example bug' 88 88 '\n' 89 ' http ://trac.webkit.org/changeset/12345\n')89 ' https://trac.webkit.org/changeset/12345\n') 90 90 self.assert_error(2, range(2, 5), 'changelog/bugnumber', 91 91 '2011-01-01 Patrick Gansterer <paroga@paroga.com>\n' -
trunk/Tools/Scripts/webkitpy/tool/bot/feeders_unittest.py
r174248 r223177 42 42 expected_logs = """Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com) 43 43 Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com) 44 MOCK setting flag 'commit-queue' to '-' on attachment '10001' with comment 'Rejecting attachment 10001 from commit-queue.\n\nnon-committer@example.com does not have committer permissions according to http ://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json.44 MOCK setting flag 'commit-queue' to '-' on attachment '10001' with comment 'Rejecting attachment 10001 from commit-queue.\n\nnon-committer@example.com does not have committer permissions according to https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. 45 45 46 46 - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. -
trunk/Tools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
r174136 r223177 77 77 78 78 foo/bar.html was authored by test@test.com. 79 http ://trac.webkit.org/browser/trunk/LayoutTests/foo/bar.html79 https://trac.webkit.org/browser/trunk/LayoutTests/foo/bar.html 80 80 81 81 FLAKE_MESSAGE … … 113 113 114 114 foo/bar.html was authored by abarth@webkit.org. 115 http ://trac.webkit.org/browser/trunk/LayoutTests/foo/bar.html115 https://trac.webkit.org/browser/trunk/LayoutTests/foo/bar.html 116 116 117 117 The dummy-queue just saw foo/bar.html flake (text diff) while processing attachment 10000 on bug 50000. -
trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py
r209216 r223177 96 96 97 97 def test_rollout(self): 98 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http ://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"98 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n" 99 99 OutputCapture().assert_outputs(self, run, args=["rollout 21654 This patch broke the world"], expected_logs=expected_logs) 100 100 101 101 def test_revert(self): 102 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http ://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"102 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n" 103 103 OutputCapture().assert_outputs(self, run, args=["revert 21654 This patch broke the world"], expected_logs=expected_logs) 104 104 105 105 def test_multi_rollout(self): 106 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http ://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"106 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n" 107 107 OutputCapture().assert_outputs(self, run, args=["rollout 21654 21655 21656 This 21654 patch broke the world"], expected_logs=expected_logs) 108 108 109 109 def test_rollout_with_r_in_svn_revision(self): 110 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http ://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"110 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n" 111 111 OutputCapture().assert_outputs(self, run, args=["rollout r21654 This patch broke the world"], expected_logs=expected_logs) 112 112 113 113 def test_multi_rollout_with_r_in_svn_revision(self): 114 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http ://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"114 expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n" 115 115 OutputCapture().assert_outputs(self, run, args=["rollout r21654 21655 r21656 This r21654 patch broke the world"], expected_logs=expected_logs) 116 116 … … 128 128 def test_rollout_invalidate_reason(self): 129 129 # FIXME: I'm slightly confused as to why this doesn't return the USAGE message. 130 expected_logs = """MOCK: irc.post: mock_nick: Preparing rollout for http ://trac.webkit.org/changeset/21654 ...130 expected_logs = """MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ... 131 131 MOCK: irc.post: mock_nick, abarth, darin, eseidel: Failed to create rollout patch: 132 132 MOCK: irc.post: The rollout reason may not begin with - (\"-bad (Requested by mock_nick on #webkit).\"). … … 137 137 138 138 def test_multi_rollout_invalidate_reason(self): 139 expected_logs = """MOCK: irc.post: mock_nick: Preparing rollout for http ://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...139 expected_logs = """MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ... 140 140 MOCK: irc.post: mock_nick, abarth, darin, eseidel: Failed to create rollout patch: 141 141 MOCK: irc.post: The rollout reason may not begin with - (\"-bad (Requested by mock_nick on #webkit).\"). -
trunk/Tools/Scripts/webkitpy/tool/bot/sheriff_unittest.py
r174136 r223177 68 68 expected_logs = u"""MOCK bug comment: bug_id=1234, cc=['watcher@example.com'] 69 69 --- Begin comment --- 70 http ://trac.webkit.org/changeset/4321 might have broken Foo and Bar70 https://trac.webkit.org/changeset/4321 might have broken Foo and Bar 71 71 --- End comment --- 72 72 73 73 MOCK bug comment: bug_id=1234, cc=['watcher@example.com'] 74 74 --- Begin comment --- 75 http ://trac.webkit.org/changeset/4321 might have broken Foo and Bar75 https://trac.webkit.org/changeset/4321 might have broken Foo and Bar 76 76 The following tests are not passing: 77 77 mock-test-1 … … 80 80 MOCK bug comment: bug_id=1234, cc=['watcher@example.com'] 81 81 --- Begin comment --- 82 http ://trac.webkit.org/changeset/4321 might have broken Foo and Bar82 https://trac.webkit.org/changeset/4321 might have broken Foo and Bar 83 83 The following tests are not passing: 84 84 mock-test-1 -
trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py
r221926 r223177 147 147 Running bindings generation tests 148 148 Running run-webkit-tests 149 Committed r49824: <http ://trac.webkit.org/changeset/49824>149 Committed r49824: <https://trac.webkit.org/changeset/49824> 150 150 Updating bug 50000 151 151 """ … … 176 176 Running run-webkit-tests 177 177 MOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--quiet'], cwd=/mock-checkout 178 Committed r49824: <http ://trac.webkit.org/changeset/49824>179 Committed r49824: <http ://trac.webkit.org/changeset/49824>178 Committed r49824: <https://trac.webkit.org/changeset/49824> 179 Committed r49824: <https://trac.webkit.org/changeset/49824> 180 180 No bug id provided. 181 181 """ … … 193 193 Running bindings generation tests 194 194 Running run-webkit-tests 195 Committed r49824: <http ://trac.webkit.org/changeset/49824>195 Committed r49824: <https://trac.webkit.org/changeset/49824> 196 196 Updating bug 50000 197 197 """ … … 224 224 Running bindings generation tests 225 225 Running run-webkit-tests 226 Committed r49824: <http ://trac.webkit.org/changeset/49824>226 Committed r49824: <https://trac.webkit.org/changeset/49824> 227 227 Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug. 228 228 """ … … 241 241 Running bindings generation tests 242 242 Running run-webkit-tests 243 Committed r49824: <http ://trac.webkit.org/changeset/49824>243 Committed r49824: <https://trac.webkit.org/changeset/49824> 244 244 Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug. 245 245 Updating working directory … … 251 251 Running bindings generation tests 252 252 Running run-webkit-tests 253 Committed r49824: <http ://trac.webkit.org/changeset/49824>253 Committed r49824: <https://trac.webkit.org/changeset/49824> 254 254 Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug. 255 255 """ … … 268 268 Running bindings generation tests 269 269 Running run-webkit-tests 270 Committed r49824: <http ://trac.webkit.org/changeset/49824>270 Committed r49824: <https://trac.webkit.org/changeset/49824> 271 271 Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug. 272 272 Updating working directory … … 278 278 Running bindings generation tests 279 279 Running run-webkit-tests 280 Committed r49824: <http ://trac.webkit.org/changeset/49824>280 Committed r49824: <https://trac.webkit.org/changeset/49824> 281 281 Not closing bug 50000 as attachment 10000 has review=+. Assuming there are more patches to land from this bug. 282 282 """ … … 292 292 MOCK create_bug 293 293 bug_title: REGRESSION(r852): Reason 294 bug_description: http ://trac.webkit.org/changeset/852 broke the build:294 bug_description: https://trac.webkit.org/changeset/852 broke the build: 295 295 Reason 296 296 component: MOCK component … … 317 317 MOCK create_bug 318 318 bug_title: REGRESSION(r852): Reason 319 bug_description: http ://trac.webkit.org/changeset/852 broke the build:319 bug_description: https://trac.webkit.org/changeset/852 broke the build: 320 320 Reason 321 321 component: MOCK component … … 342 342 MOCK create_bug 343 343 bug_title: REGRESSION(r852): Reason 344 bug_description: http ://trac.webkit.org/changeset/852 broke the build:344 bug_description: https://trac.webkit.org/changeset/852 broke the build: 345 345 Reason 346 346 component: MOCK component … … 366 366 MOCK create_bug 367 367 bug_title: REGRESSION(r3001): Reason 368 bug_description: http ://trac.webkit.org/changeset/3001 broke the build:368 bug_description: https://trac.webkit.org/changeset/3001 broke the build: 369 369 Reason 370 370 component: MOCK component … … 392 392 MOCK create_bug 393 393 bug_title: REGRESSION(r963): Reason 394 bug_description: http ://trac.webkit.org/changeset/963 broke the build:394 bug_description: https://trac.webkit.org/changeset/963 broke the build: 395 395 Reason 396 396 component: MOCK component … … 419 419 Was that diff correct? 420 420 Building WebKit 421 Committed r49824: <http ://trac.webkit.org/changeset/49824>421 Committed r49824: <https://trac.webkit.org/changeset/49824> 422 422 MOCK reopen_bug 50000 with comment 'Reverted r852 for reason: 423 423 424 424 Reason 425 425 426 Committed r49824: <http ://trac.webkit.org/changeset/49824>'426 Committed r49824: <https://trac.webkit.org/changeset/49824>' 427 427 """ 428 428 self.assert_execute_outputs(Rollout(), [852, "Reason", "Description"], options=self._default_options(), expected_logs=expected_logs) … … 435 435 Was that diff correct? 436 436 Building WebKit 437 Committed r49824: <http ://trac.webkit.org/changeset/49824>437 Committed r49824: <https://trac.webkit.org/changeset/49824> 438 438 MOCK reopen_bug 50000 with comment 'Reverted r852 and r963 for reason: 439 439 440 440 Reason 441 441 442 Committed r49824: <http ://trac.webkit.org/changeset/49824>'442 Committed r49824: <https://trac.webkit.org/changeset/49824>' 443 443 MOCK reopen_bug 50005 with comment 'Reverted r852 and r963 for reason: 444 444 445 445 Reason 446 446 447 Committed r49824: <http ://trac.webkit.org/changeset/49824>'447 Committed r49824: <https://trac.webkit.org/changeset/49824>' 448 448 """ 449 449 self.assert_execute_outputs(Rollout(), ["852 963", "Reason", "Description"], options=self._default_options(), expected_logs=expected_logs) … … 457 457 Was that diff correct? 458 458 Building WebKit 459 Committed r49824: <http ://trac.webkit.org/changeset/49824>459 Committed r49824: <https://trac.webkit.org/changeset/49824> 460 460 MOCK reopen_bug 50000 with comment 'Reverted r852, r963, and r3001 for reason: 461 461 462 462 Reason 463 463 464 Committed r49824: <http ://trac.webkit.org/changeset/49824>'464 Committed r49824: <https://trac.webkit.org/changeset/49824>' 465 465 MOCK reopen_bug 50005 with comment 'Reverted r852, r963, and r3001 for reason: 466 466 467 467 Reason 468 468 469 Committed r49824: <http ://trac.webkit.org/changeset/49824>'469 Committed r49824: <https://trac.webkit.org/changeset/49824>' 470 470 MOCK reopen_bug 50004 with comment 'Reverted r852, r963, and r3001 for reason: 471 471 472 472 Reason 473 473 474 Committed r49824: <http ://trac.webkit.org/changeset/49824>'474 Committed r49824: <https://trac.webkit.org/changeset/49824>' 475 475 """ 476 476 self.assert_execute_outputs(Rollout(), ["852 3001 963", "Reason", "Description"], options=self._default_options(), expected_logs=expected_logs) … … 484 484 Was that diff correct? 485 485 Building WebKit 486 Committed r49824: <http ://trac.webkit.org/changeset/49824>486 Committed r49824: <https://trac.webkit.org/changeset/49824> 487 487 MOCK reopen_bug 50000 with comment 'Reverted r852, r963, and r999 for reason: 488 488 489 489 Reason 490 490 491 Committed r49824: <http ://trac.webkit.org/changeset/49824>'491 Committed r49824: <https://trac.webkit.org/changeset/49824>' 492 492 MOCK reopen_bug 50005 with comment 'Reverted r852, r963, and r999 for reason: 493 493 494 494 Reason 495 495 496 Committed r49824: <http ://trac.webkit.org/changeset/49824>'496 Committed r49824: <https://trac.webkit.org/changeset/49824>' 497 497 """ 498 498 self.assert_execute_outputs(Rollout(), ["852 999 963", "Reason", "Description"], options=self._default_options(), expected_logs=expected_logs) -
trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot_unittest.py
r211134 r223177 89 89 90 90 Unreviewed, rolling out r142734. 91 http ://trac.webkit.org/changeset/14273491 https://trac.webkit.org/changeset/142734 92 92 https://bugs.webkit.org/show_bug.cgi?id=110018 93 93 … … 125 125 126 126 Unreviewed, rolling out r134927 and r134944. 127 http ://trac.webkit.org/changeset/134927128 http ://trac.webkit.org/changeset/134944127 https://trac.webkit.org/changeset/134927 128 https://trac.webkit.org/changeset/134944 129 129 https://bugs.webkit.org/show_bug.cgi?id=103028 130 130 -
trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
r205003 r223177 137 137 "process_work_item": """Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com) 138 138 Warning, attachment 10001 on bug 50000 has invalid committer (non-committer@example.com) 139 MOCK setting flag 'commit-queue' to '-' on attachment '10001' with comment 'Rejecting attachment 10001 from commit-queue.\n\nnon-committer@example.com does not have committer permissions according to http ://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json.139 MOCK setting flag 'commit-queue' to '-' on attachment '10001' with comment 'Rejecting attachment 10001 from commit-queue.\n\nnon-committer@example.com does not have committer permissions according to https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. 140 140 141 141 - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. -
trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations.py
r170637 r223177 203 203 204 204 if revision.isdigit(): 205 revision = "http ://trac.webkit.org/changeset/" + revision205 revision = "https://trac.webkit.org/changeset/" + revision 206 206 counter['commits'] += " commit: %s on %s by %s (%s)\n" % (revision, commit_date, author_name, author_email) 207 207 -
trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py
r220715 r223177 174 174 MOCK comment 175 175 176 Committed r9876: <http ://trac.webkit.org/changeset/9876>176 Committed r9876: <https://trac.webkit.org/changeset/9876> 177 177 --- End comment --- 178 178 -
trunk/Tools/Scripts/webkitpy/tool/servers/data/rebaselineserver/util.js
r90336 r223177 91 91 function getTracUrl(layoutTestPath) 92 92 { 93 return 'http ://trac.webkit.org/browser/trunk/LayoutTests/' + layoutTestPath;93 return 'https://trac.webkit.org/browser/trunk/LayoutTests/' + layoutTestPath; 94 94 } 95 95 -
trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py
r202319 r223177 38 38 capture = OutputCapture() 39 39 step = CloseBugForLandDiff(MockTool(), MockOptions()) 40 expected_logs = "Committed r49824: <http ://trac.webkit.org/changeset/49824>\nNo bug id provided.\n"40 expected_logs = "Committed r49824: <https://trac.webkit.org/changeset/49824>\nNo bug id provided.\n" 41 41 capture.assert_outputs(self, step.run, [{"commit_text": "Mock commit text"}], expected_logs=expected_logs) -
trunk/Tools/Scripts/webkitpy/tool/steps/commit_unittest.py
r174136 r223177 51 51 52 52 tool.executive = MockExecutive(should_log=True, should_throw_when_run=False) 53 expected_logs = "Committed r49824: <http ://trac.webkit.org/changeset/49824>\n"53 expected_logs = "Committed r49824: <https://trac.webkit.org/changeset/49824>\n" 54 54 capture.assert_outputs(self, step.run, [state], expected_logs=expected_logs) 55 55 … … 58 58 } 59 59 expected_logs = """MOCK run_and_throw_if_fail: ['mock-check-webkit-style', '--diff-files', 'platform/chromium/%s'], cwd=/mock-checkout 60 Committed r49824: <http ://trac.webkit.org/changeset/49824>60 Committed r49824: <https://trac.webkit.org/changeset/49824> 61 61 """ % filename 62 62 capture.assert_outputs(self, step.run, [state], expected_logs=expected_logs) -
trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py
r174136 r223177 48 48 "Blocked Bug's Description" 49 49 http://bug.example.com/12345 50 http ://trac.webkit.org/changeset/1234550 https://trac.webkit.org/changeset/12345 51 51 ''' 52 52 … … 59 59 Reverted changeset: 60 60 61 http ://trac.webkit.org/changeset/1234561 https://trac.webkit.org/changeset/12345 62 62 ''' 63 63 … … 72 72 "r12345's Description" 73 73 http://bug.example.com/12345 74 http ://trac.webkit.org/changeset/1234574 https://trac.webkit.org/changeset/12345 75 75 76 76 "r12346's Description" 77 77 http://bug.example.com/12346 78 http ://trac.webkit.org/changeset/1234678 https://trac.webkit.org/changeset/12346 79 79 80 80 "r12347's Description" 81 81 http://bug.example.com/12347 82 http ://trac.webkit.org/changeset/1234782 https://trac.webkit.org/changeset/12347 83 83 ''' 84 84 … … 91 91 Reverted changesets: 92 92 93 http ://trac.webkit.org/changeset/1234593 https://trac.webkit.org/changeset/12345 94 94 95 http ://trac.webkit.org/changeset/1234695 https://trac.webkit.org/changeset/12346 96 96 97 http ://trac.webkit.org/changeset/1234797 https://trac.webkit.org/changeset/12347 98 98 ''' 99 99 … … 108 108 "r12345's Description" 109 109 http://bug.example.com/12345 110 http ://trac.webkit.org/changeset/12345110 https://trac.webkit.org/changeset/12345 111 111 112 http ://trac.webkit.org/changeset/12346112 https://trac.webkit.org/changeset/12346 113 113 114 114 "r12347's Description" 115 115 http://bug.example.com/12347 116 http ://trac.webkit.org/changeset/12347116 https://trac.webkit.org/changeset/12347 117 117 ''' 118 118 … … 131 131 "Blocked Bug's Description" 132 132 http://bug.example.com/12345 133 http ://trac.webkit.org/changeset/12345133 https://trac.webkit.org/changeset/12345 134 134 """ 135 135 … … 145 145 "r12345's Description" 146 146 http://bug.example.com/12345 147 http ://trac.webkit.org/changeset/12345147 https://trac.webkit.org/changeset/12345 148 148 149 149 "r12346's Description" 150 150 http://bug.example.com/12346 151 http ://trac.webkit.org/changeset/12346151 https://trac.webkit.org/changeset/12346 152 152 153 153 "r12347's Description" 154 154 http://bug.example.com/12347 155 http ://trac.webkit.org/changeset/12347155 https://trac.webkit.org/changeset/12347 156 156 ''' 157 157
Note: See TracChangeset
for help on using the changeset viewer.