Skip to content
Permalink
Browse files
Use https for trac changeset and browser links
https://bugs.webkit.org/show_bug.cgi?id=178167

Reviewed by Alexey Proskuryakov.

Switch the http://trac.webkit.org/changeset and
http://trac.webkit.org/browser links that are printed by webkitpy to
https. Also update the test expectations.

* Scripts/webkitpy/common/checkout/checkout_unittest.py:
* Scripts/webkitpy/common/config/committervalidator_unittest.py:
(CommitterValidatorTest.test_flag_permission_rejection_message):
* Scripts/webkitpy/common/config/urls.py:
(view_source_url):
(view_revision_url):
* Scripts/webkitpy/common/net/bugzilla/bug_unittest.py:
(BugTest.test_commit_revision):
* Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py:
* Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py:
* Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
(MainTest):
(MainTest.test_run_with_upload_json_should_generate_perf_webkit_json):
* Scripts/webkitpy/style/checkers/changelog_unittest.py:
(ChangeLogCheckerTest.test_missing_bug_number):
* Scripts/webkitpy/tool/bot/feeders_unittest.py:
* Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
* Scripts/webkitpy/tool/bot/ircbot_unittest.py:
(IRCBotTest.test_rollout):
(IRCBotTest.test_revert):
(IRCBotTest.test_multi_rollout):
(IRCBotTest.test_rollout_with_r_in_svn_revision):
(IRCBotTest.test_multi_rollout_with_r_in_svn_revision):
(IRCBotTest.test_rollout_invalidate_reason):
(test_multi_rollout_invalidate_reason):
* Scripts/webkitpy/tool/bot/sheriff_unittest.py:
* Scripts/webkitpy/tool/commands/download_unittest.py:
* Scripts/webkitpy/tool/commands/newcommitbot_unittest.py:
* Scripts/webkitpy/tool/commands/queues_unittest.py:
* Scripts/webkitpy/tool/commands/suggestnominations.py:
(SuggestNominations._count_commit):
* Scripts/webkitpy/tool/commands/upload_unittest.py:
* Scripts/webkitpy/tool/servers/data/rebaselineserver/util.js:
(getTracUrl):
(getSortedKeys):
* Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py:
(CloseBugForLandDiffTest.test_empty_state):
* Scripts/webkitpy/tool/steps/commit_unittest.py:
(CommitTest._test_check_test_expectations):
* Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py:
(UpdateChangeLogsForRevertTest):

Canonical link: https://commits.webkit.org/194417@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223177 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
tpopela committed Oct 11, 2017
1 parent 5738209 commit 0ff98a23d6bb11c53070c52653b2c9e208a20b9c
Showing 22 changed files with 160 additions and 107 deletions.
@@ -1,3 +1,56 @@
2017-10-11 Tomas Popela <tpopela@redhat.com>

Use https for trac changeset and browser links
https://bugs.webkit.org/show_bug.cgi?id=178167

Reviewed by Alexey Proskuryakov.

Switch the http://trac.webkit.org/changeset and
http://trac.webkit.org/browser links that are printed by webkitpy to
https. Also update the test expectations.

* Scripts/webkitpy/common/checkout/checkout_unittest.py:
* Scripts/webkitpy/common/config/committervalidator_unittest.py:
(CommitterValidatorTest.test_flag_permission_rejection_message):
* Scripts/webkitpy/common/config/urls.py:
(view_source_url):
(view_revision_url):
* Scripts/webkitpy/common/net/bugzilla/bug_unittest.py:
(BugTest.test_commit_revision):
* Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py:
* Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py:
* Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
(MainTest):
(MainTest.test_run_with_upload_json_should_generate_perf_webkit_json):
* Scripts/webkitpy/style/checkers/changelog_unittest.py:
(ChangeLogCheckerTest.test_missing_bug_number):
* Scripts/webkitpy/tool/bot/feeders_unittest.py:
* Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
* Scripts/webkitpy/tool/bot/ircbot_unittest.py:
(IRCBotTest.test_rollout):
(IRCBotTest.test_revert):
(IRCBotTest.test_multi_rollout):
(IRCBotTest.test_rollout_with_r_in_svn_revision):
(IRCBotTest.test_multi_rollout_with_r_in_svn_revision):
(IRCBotTest.test_rollout_invalidate_reason):
(test_multi_rollout_invalidate_reason):
* Scripts/webkitpy/tool/bot/sheriff_unittest.py:
* Scripts/webkitpy/tool/commands/download_unittest.py:
* Scripts/webkitpy/tool/commands/newcommitbot_unittest.py:
* Scripts/webkitpy/tool/commands/queues_unittest.py:
* Scripts/webkitpy/tool/commands/suggestnominations.py:
(SuggestNominations._count_commit):
* Scripts/webkitpy/tool/commands/upload_unittest.py:
* Scripts/webkitpy/tool/servers/data/rebaselineserver/util.js:
(getTracUrl):
(getSortedKeys):
* Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py:
(CloseBugForLandDiffTest.test_empty_state):
* Scripts/webkitpy/tool/steps/commit_unittest.py:
(CommitTest._test_check_test_expectations):
* Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py:
(UpdateChangeLogsForRevertTest):

2017-10-10 Ryosuke Niwa <rniwa@webkit.org>

Enable custom pasteboard data in DumpRenderTree and WebKitTestRunner
@@ -121,11 +121,11 @@
Reverted changesets:
"[Win] Build fix after r134209"
http://trac.webkit.org/changeset/170340
https://trac.webkit.org/changeset/170340
"[Win] Clean up and refactor WinLauncher"
https://bugs.webkit.org/show_bug.cgi?id=134209
http://trac.webkit.org/changeset/170339
https://trac.webkit.org/changeset/170339
"""


@@ -286,11 +286,11 @@ def test_commit_message_for_one_rollout_changelog(self):
Reverted changesets:
"[Win] Build fix after r134209"
http://trac.webkit.org/changeset/170340
https://trac.webkit.org/changeset/170340
"[Win] Clean up and refactor WinLauncher"
https://bugs.webkit.org/show_bug.cgi?id=134209
http://trac.webkit.org/changeset/170339
https://trac.webkit.org/changeset/170339
Patch by Daniel Bates <dabates@apple.com> on 2014-06-23
"""
@@ -312,11 +312,11 @@ def test_commit_message_for_rollout_changelogs_with_different_directories(self):
Reverted changesets:
"[Win] Build fix after r134209"
http://trac.webkit.org/changeset/170340
https://trac.webkit.org/changeset/170340
"[Win] Clean up and refactor WinLauncher"
https://bugs.webkit.org/show_bug.cgi?id=134209
http://trac.webkit.org/changeset/170339
https://trac.webkit.org/changeset/170339
Patch by Daniel Bates <dabates@apple.com> on 2014-06-23
"""
@@ -36,7 +36,7 @@ class CommitterValidatorTest(unittest.TestCase):
def test_flag_permission_rejection_message(self):
validator = CommitterValidator(MockHost())
self.assertEqual(validator._contributors_json_path(), "Tools/Scripts/webkitpy/common/config/contributors.json")
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.
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.
- If you do not have review rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.
@@ -30,11 +30,11 @@


def view_source_url(local_path):
return "http://trac.webkit.org/browser/trunk/%s" % local_path
return "https://trac.webkit.org/browser/trunk/%s" % local_path


def view_revision_url(revision_number):
return "http://trac.webkit.org/changeset/%s" % revision_number
return "https://trac.webkit.org/changeset/%s" % revision_number


contribution_guidelines = "http://webkit.org/coding/contributing.html"
@@ -57,27 +57,27 @@ def test_commit_revision(self):
self.assertEqual(bug.commit_revision(), None)

bug = Bug({"comments": [
{"text": "Committed r138776: <http://trac.webkit.org/changeset/138776>"},
{"text": "Committed r138776: <https://trac.webkit.org/changeset/138776>"},
]}, bugzilla=None)
self.assertEqual(bug.commit_revision(), 138776)

bug = Bug({"comments": [
{"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http://trac.webkit.org/changeset/138776>"},
{"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <https://trac.webkit.org/changeset/138776>"},
]}, bugzilla=None)
self.assertEqual(bug.commit_revision(), 138776)

bug = Bug({"comments": [
{"text": "Comment before"},
{"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http://trac.webkit.org/changeset/138776>"},
{"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <https://trac.webkit.org/changeset/138776>"},
{"text": "Comment after"},
]}, bugzilla=None)
self.assertEqual(bug.commit_revision(), 138776)

bug = Bug({"comments": [
{"text": "Comment before"},
{"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <http://trac.webkit.org/changeset/138776>"},
{"text": "(From update of attachment 181269) Clearing flags on attachment: 181269 Committed r138776: <https://trac.webkit.org/changeset/138776>"},
{"text": "Comment Middle"},
{"text": "(From update of attachment 181280) Clearing flags on attachment: 181280 Committed r138976: <http://trac.webkit.org/changeset/138976>"},
{"text": "(From update of attachment 181280) Clearing flags on attachment: 181280 Committed r138976: <https://trac.webkit.org/changeset/138976>"},
{"text": "Comment After"},
]}, bugzilla=None)
self.assertEqual(bug.commit_revision(), 138976)
@@ -181,7 +181,7 @@ def _id_to_object_dictionary(*objects):
"bug_status": "ASSIGNED",
"comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Message1.\nCommitted r35: <http://trac.webkit.org/changeset/35>",
"text": "Message1.\nCommitted r35: <https://trac.webkit.org/changeset/35>",
},
],
}
@@ -197,11 +197,11 @@ def _id_to_object_dictionary(*objects):
"bug_status": "NEW",
"comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Committed r30: <http://trac.webkit.org/changeset/30>",
"text": "Committed r30: <https://trac.webkit.org/changeset/30>",
},
{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Committed r31: <http://trac.webkit.org/changeset/31>",
"text": "Committed r31: <https://trac.webkit.org/changeset/31>",
},
],
}
@@ -217,11 +217,11 @@ def _id_to_object_dictionary(*objects):
"bug_status": "REOPENED",
"comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Committed r25: <http://trac.webkit.org/changeset/30>",
"text": "Committed r25: <https://trac.webkit.org/changeset/30>",
},
{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Rolled out in <http://trac.webkit.org/changeset/26",
"text": "Rolled out in <https://trac.webkit.org/changeset/26",
},
],
}
@@ -238,7 +238,7 @@ def _id_to_object_dictionary(*objects):
"dup_id": 50002,
"comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Committed r15: <http://trac.webkit.org/changeset/15>",
"text": "Committed r15: <https://trac.webkit.org/changeset/15>",
},
],

@@ -255,7 +255,7 @@ def _id_to_object_dictionary(*objects):
"bug_status": "RESOLVED",
"comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Committed r95: <http://trac.webkit.org/changeset/95>",
"text": "Committed r95: <https://trac.webkit.org/changeset/95>",
},
],

@@ -272,7 +272,7 @@ def _id_to_object_dictionary(*objects):
"bug_status": "RESOLVED",
"comments": [{"comment_date": datetime.datetime(2011, 6, 11, 9, 4, 3),
"comment_email": "bar@foo.com",
"text": "Message1.\nCommitted r105: <http://trac.webkit.org/changeset/105>",
"text": "Message1.\nCommitted r105: <https://trac.webkit.org/changeset/105>",
},
],
}
@@ -334,25 +334,25 @@ def test_parse_build_to_revision_map(self):
</tr>
<tr class="alt">
<td>Jan 10 15:49</td>
<td><span class="revision" title="Revision 104643"><a href="http://trac.webkit.org/changeset/104643">104643</a></span></td>
<td><span class="revision" title="Revision 104643"><a href="https://trac.webkit.org/changeset/104643">104643</a></span></td>
<td class="success">failure</td> <td><a href=".../37604">#37604</a></td>
<td class="left">Build successful</td>
</tr>
<tr class="">
<td>Jan 10 15:32</td>
<td><span class="revision" title="Revision 104636"><a href="http://trac.webkit.org/changeset/104636">104636</a></span></td>
<td><span class="revision" title="Revision 104636"><a href="https://trac.webkit.org/changeset/104636">104636</a></span></td>
<td class="success">failure</td> <td><a href=".../37603">#37603</a></td>
<td class="left">Build successful</td>
</tr>
<tr class="alt">
<td>Jan 10 15:18</td>
<td><span class="revision" title="Revision 104635"><a href="http://trac.webkit.org/changeset/104635">104635</a></span></td>
<td><span class="revision" title="Revision 104635"><a href="https://trac.webkit.org/changeset/104635">104635</a></span></td>
<td class="success">success</td> <td><a href=".../37602">#37602</a></td>
<td class="left">Build successful</td>
</tr>
<tr class="">
<td>Jan 10 14:51</td>
<td><span class="revision" title="Revision 104633"><a href="http://trac.webkit.org/changeset/104633">104633</a></span></td>
<td><span class="revision" title="Revision 104633"><a href="https://trac.webkit.org/changeset/104633">104633</a></span></td>
<td class="failure">failure</td> <td><a href=".../37601">#37601</a></td>
<td class="left">Failed compile-webkit</td>
</tr>
@@ -363,27 +363,27 @@ def test_parse_build_to_revision_map(self):
<table>
<tr class="alt">
<td>Jan 10 15:49</td>
<td><span class="revision" title="Revision 104643"><a href="http://trac.webkit.org/changeset/104643">104643</a></span></td>
<td><span class="revision" title="Revision 104643"><a href="https://trac.webkit.org/changeset/104643">104643</a></span></td>
<td class="success">failure</td>
</tr>
<tr class="">
<td>Jan 10 15:32</td>
<td><span class="revision" title="Revision 104636"><a href="http://trac.webkit.org/changeset/104636">104636</a></span></td>
<td><span class="revision" title="Revision 104636"><a href="https://trac.webkit.org/changeset/104636">104636</a></span></td>
<td class="success">failure</td>
</tr>
<tr class="alt">
<td>Jan 10 15:18</td>
<td><span class="revision" title="Revision 104635"><a href="http://trac.webkit.org/changeset/104635">104635</a></span></td>
<td><span class="revision" title="Revision 104635"><a href="https://trac.webkit.org/changeset/104635">104635</a></span></td>
<td class="success">failure</td>
</tr>
<tr class="">
<td>Jan 10 11:58</td>
<td><span class="revision" title="Revision ??"><a href="http://trac.webkit.org/changeset/%3F%3F">??</a></span></td>
<td><span class="revision" title="Revision ??"><a href="https://trac.webkit.org/changeset/%3F%3F">??</a></span></td>
<td class="retry">retry</td>
</tr>
<tr class="">
<td>Jan 10 14:51</td>
<td><span class="revision" title="Revision 104633"><a href="http://trac.webkit.org/changeset/104633">104633</a></span></td>
<td><span class="revision" title="Revision 104633"><a href="https://trac.webkit.org/changeset/104633">104633</a></span></td>
<td class="failure">failure</td>
</tr>
</table>
@@ -53,7 +53,7 @@ class EventTargetWrapperTestData:
"""

results = {'url': 'http://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html',
results = {'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html',
'metrics': {'Time': {'current': [[1486.0, 1471.0, 1510.0, 1505.0, 1478.0, 1490.0]] * 4}}}


@@ -68,7 +68,7 @@ class SomeParserTestData:
"""

results = {'url': 'http://trac.webkit.org/browser/trunk/PerformanceTests/Parser/some-parser.html',
results = {'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/some-parser.html',
'metrics': {'Time': {'current': [[1080.0, 1120.0, 1095.0, 1101.0, 1104.0]] * 4}}}


@@ -110,18 +110,18 @@ class TestWithSubtestsData:
Finished: 0.1 s
"""

results = {'url': 'http://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
results = {'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
'metrics': {'Time': {'current': [[1080.0, 1120.0, 1095.0, 1101.0, 1104.0]] * 4}},
'tests': {
'subtest': {
'url': 'http://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
'metrics': {'Time': {'current': [[1.0, 2.0, 3.0, 4.0, 5.0]] * 4}}},
'total-test': {
'url': 'http://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
'metrics': {'Time': {'current': [[1.0, 2.0, 3.0, 4.0, 5.0]] * 4, "aggregators": ["Total"]}},
'tests': {
'subsubtest':
{'url': 'http://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
{'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Parser/test-with-subtests.html',
'metrics': {'Time': {'current': [[1.0, 2.0, 3.0, 4.0, 5.0]] * 4}}}}}}}


@@ -312,10 +312,10 @@ def mock_upload_json(hostname, json_path, host_path=None):

_event_target_wrapper_and_inspector_results = {
"Bindings":
{"url": "http://trac.webkit.org/browser/trunk/PerformanceTests/Bindings",
{"url": "https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings",
"tests": {"event-target-wrapper": EventTargetWrapperTestData.results}},
"Parser":
{"url": "http://trac.webkit.org/browser/trunk/PerformanceTests/Parser",
{"url": "https://trac.webkit.org/browser/trunk/PerformanceTests/Parser",
"tests": {"some-parser": SomeParserTestData.results}}}

def test_run_with_json_output(self):
@@ -511,10 +511,10 @@ def test_run_with_upload_json_should_generate_perf_webkit_json(self):
self.assertEqual(output['revisions'], {'WebKit': {'revision': '5678', 'timestamp': '2013-02-01 08:48:05 +0000'}})
self.assertEqual(output['tests'].keys(), ['Bindings', 'Parser'])
self.assertEqual(sorted(output['tests']['Bindings'].keys()), ['tests', 'url'])
self.assertEqual(output['tests']['Bindings']['url'], 'http://trac.webkit.org/browser/trunk/PerformanceTests/Bindings')
self.assertEqual(output['tests']['Bindings']['url'], 'https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings')
self.assertEqual(output['tests']['Bindings']['tests'].keys(), ['event-target-wrapper'])
self.assertEqual(output['tests']['Bindings']['tests']['event-target-wrapper'], {
'url': 'http://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html',
'url': 'https://trac.webkit.org/browser/trunk/PerformanceTests/Bindings/event-target-wrapper.html',
'metrics': {'Time': {'current': [[1486.0, 1471.0, 1510.0, 1505.0, 1478.0, 1490.0]] * 4}}})

def test_run_with_repeat(self):
@@ -86,7 +86,7 @@ def test_missing_bug_number(self):
'\n'
' Example bug'
'\n'
' http://trac.webkit.org/changeset/12345\n')
' https://trac.webkit.org/changeset/12345\n')
self.assert_error(2, range(2, 5), 'changelog/bugnumber',
'2011-01-01 Patrick Gansterer <paroga@paroga.com>\n'
' Example bug\n'

0 comments on commit 0ff98a2

Please sign in to comment.