nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1794153 - Upgrade mitmproxy to version 8.1.1 for raptor-browsertime and mozperftest. r=perftest-reviewers,sparky

Browse source 
This patch adds a binary for the current latest mitmproxy version. Recordings are forward compatible so it should be safe to start replaying recordings on mitm8, with re-recordings happening in a future date.

Only desktop recordings will be addressed here, and android platforms at a later date.

Differential Revision: https://phabricator.services.mozilla.com/D159798
This commit is contained in:
Kash Shampur 2022-11-10 17:38:38 +00:00
parent c9e98f8fad
commit ddcbde0d28
11 changed files with 78 additions and 62 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
testing/mozbase/mozproxy/mozproxy/backends/mitm/manifests/mitmproxy-rel-bin-8.1.1-linux64.manifest Normal file
View file

@ -0,0 +1,10 @@
[
{
"filename": "mitmproxy-8.1.1-linux.tar.gz",
"size": 90353267,
"algorithm": "sha512",
"digest": "d6d99dca35dc5797549e58f872067ba6a1bff9903db880eabb9993a224e35fba26a001c0665ce7a9983f1b2212aa9c83646a58e6000c5415aea731fa1fe7f46d",
"unpack": true,
"visibility": "public"
}
]

10
testing/mozbase/mozproxy/mozproxy/backends/mitm/manifests/mitmproxy-rel-bin-8.1.1-osx.manifest Normal file
View file

@ -0,0 +1,10 @@
[
{
"filename": "mitmproxy-8.1.1-osx.tar.gz",
"size": 45230764,
"algorithm": "sha512",
"digest": "5ce3893a295c211a05d106f434fa6876dc9d32777c5d6bf1c04aff6ca530fe2dae2140db28b974917c92a4d42892591cf734f6c564ad8ff9ed6093e5d90ee737",
"unpack": true,
"visibility": "public"
}
]

10
testing/mozbase/mozproxy/mozproxy/backends/mitm/manifests/mitmproxy-rel-bin-8.1.1-win.manifest Normal file
View file

@ -0,0 +1,10 @@
[
{
"filename": "mitmproxy-8.1.1-windows.zip",
"size": 58309424,
"algorithm": "sha512",
"digest": "9f3e73cc95573c85c3ed9b43f25dee9f07d16ee937a8aaad10a6c445584f3d7e3592bdf312b048baae1b30dc83e1f391ad692b5c35d959423b1e861e85576eab",
"unpack": true,
"visibility": "public"
}
]

2
testing/mozbase/mozproxy/mozproxy/backends/mitm/mitm.py
View file

@ -296,7 +296,7 @@ class Mitmproxy(Playback):
else: else:
# playback mode # playback mode
if len(self.playback_files) > 0: if len(self.playback_files) > 0:
if self.config["playback_version"] == "7.0.4": if self.config["playback_version"] == "8.1.1":
command.extend( command.extend(
[ [
"--set", "--set",

21
testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/alt-serverplayback.py
View file

@ -13,8 +13,9 @@
# see Bug 1739418: https://bugzilla.mozilla.org/show_bug.cgi?id=1739418 # see Bug 1739418: https://bugzilla.mozilla.org/show_bug.cgi?id=1739418
import hashlib import hashlib
import typing
import urllib import urllib
from collections.abc import Hashable, Sequence
from typing import Any, Optional
import mitmproxy.types import mitmproxy.types
from mitmproxy import command, hooks from mitmproxy import command, hooks
@ -25,7 +26,7 @@ from mitmproxy import io
class AltServerPlayback: class AltServerPlayback:
flowmap: typing.Dict[typing.Hashable, typing.List[http.HTTPFlow]] flowmap: dict[Hashable, list[http.HTTPFlow]]
configured: bool configured: bool
def __init__(self): def __init__(self):
@ -59,13 +60,13 @@ class AltServerPlayback:
) )
loader.add_option( loader.add_option(
"alt_server_replay_use_headers", "alt_server_replay_use_headers",
typing.Sequence[str], Sequence[str],
[], [],
"Request headers to be considered during replay.", "Request headers to be considered during replay.",
) )
loader.add_option( loader.add_option(
"alt_server_replay", "alt_server_replay",
typing.Sequence[str], Sequence[str],
[], [],
"Replay server responses from a saved file.", "Replay server responses from a saved file.",
) )
@ -77,7 +78,7 @@ class AltServerPlayback:
) )
loader.add_option( loader.add_option(
"alt_server_replay_ignore_params", "alt_server_replay_ignore_params",
typing.Sequence[str], Sequence[str],
[], [],
""" """
Request's parameters to be ignored while searching for a saved flow Request's parameters to be ignored while searching for a saved flow
@ -86,7 +87,7 @@ class AltServerPlayback:
) )
loader.add_option( loader.add_option(
"alt_server_replay_ignore_payload_params", "alt_server_replay_ignore_payload_params",
typing.Sequence[str], Sequence[str],
[], [],
""" """
Request's payload parameters (application/x-www-form-urlencoded or Request's payload parameters (application/x-www-form-urlencoded or
@ -122,7 +123,7 @@ class AltServerPlayback:
) )
@command.command("replay.server") @command.command("replay.server")
def load_flows(self, flows: typing.Sequence[flow.Flow]) -> None: def load_flows(self, flows: Sequence[flow.Flow]) -> None:
""" """
Replay server responses from flows. Replay server responses from flows.
""" """
@ -155,7 +156,7 @@ class AltServerPlayback:
def count(self) -> int: def count(self) -> int:
return sum([len(i) for i in self.flowmap.values()]) return sum([len(i) for i in self.flowmap.values()])
def _hash(self, flow: http.HTTPFlow) -> typing.Hashable: def _hash(self, flow: http.HTTPFlow) -> Hashable:
""" """
Calculates a loose hash of the flow request. Calculates a loose hash of the flow request.
""" """
@ -163,7 +164,7 @@ class AltServerPlayback:
_, _, path, _, query, _ = urllib.parse.urlparse(r.url) _, _, path, _, query, _ = urllib.parse.urlparse(r.url)
queriesArray = urllib.parse.parse_qsl(query, keep_blank_values=True) queriesArray = urllib.parse.parse_qsl(query, keep_blank_values=True)
key: typing.List[typing.Any] = [str(r.scheme), str(r.method), str(path)] key: list[Any] = [str(r.scheme), str(r.method), str(path)]
if not ctx.options.alt_server_replay_ignore_content: if not ctx.options.alt_server_replay_ignore_content:
if ctx.options.alt_server_replay_ignore_payload_params and r.multipart_form: if ctx.options.alt_server_replay_ignore_payload_params and r.multipart_form:
key.extend( key.extend(
@ -206,7 +207,7 @@ class AltServerPlayback:
key.append(headers) key.append(headers)
return hashlib.sha256(repr(key).encode("utf8", "surrogateescape")).digest() return hashlib.sha256(repr(key).encode("utf8", "surrogateescape")).digest()
def next_flow(self, flow: http.HTTPFlow) -> typing.Optional[http.HTTPFlow]: def next_flow(self, flow: http.HTTPFlow) -> Optional[http.HTTPFlow]:
""" """
Returns the next flow object, or None if no matching flow was Returns the next flow object, or None if no matching flow was
found. found.

2
testing/mozbase/mozproxy/mozproxy/driver.py
View file

@ -48,7 +48,7 @@ def main():
) )
parser.add_argument( parser.add_argument(
"--tool-version", "--tool-version",
default="7.0.4", default="8.1.1",
help="The playback tool version to use (default: %(default)s)", help="The playback tool version to use (default: %(default)s)",
) )
parser.add_argument( parser.add_argument(

2
testing/mozbase/mozproxy/tests/test_recording.py
View file

@ -35,7 +35,7 @@ def test_record_and_replay(*args):
config = { config = {
"playback_tool": "mitmproxy", "playback_tool": "mitmproxy",
"recording_file": recording_file, "recording_file": recording_file,
"playback_version": "5.1.1", "playback_version": "8.1.1",
"platform": mozinfo.os, "platform": mozinfo.os,
"run_local": "MOZ_AUTOMATION" not in os.environ, "run_local": "MOZ_AUTOMATION" not in os.environ,
"binary": "firefox", "binary": "firefox",

62
testing/perfdocs/generated/raptor.rst
View file

@ -6355,7 +6355,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-amazon.manifest * **playback pageset manifest**: mitm7-linux-firefox-amazon.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.amazon.com/Acer-A515-46-R14K-Quad-Core-Processor-Backlit/dp/B08VKNVDDR/ref=sr_1_3?dchild=1&keywords=laptop&qid=1627047187&sr=8-3>`__ * **secondary url**: `<https://www.amazon.com/Acer-A515-46-R14K-Quad-Core-Processor-Backlit/dp/B08VKNVDDR/ref=sr_1_3?dchild=1&keywords=laptop&qid=1627047187&sr=8-3>`__
* **test url**: `<https://www.amazon.com/s?k=laptop&ref=nb_sb_noss_1>`__ * **test url**: `<https://www.amazon.com/s?k=laptop&ref=nb_sb_noss_1>`__
* **type**: pageload * **type**: pageload
@ -7005,7 +7005,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-bing-search.manifest * **playback pageset manifest**: mitm5-linux-firefox-bing-search.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://www.bing.com/search?q=barack+obama>`__ * **test url**: `<https://www.bing.com/search?q=barack+obama>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -7318,7 +7318,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-buzzfeed.manifest * **playback pageset manifest**: mitm7-linux-firefox-buzzfeed.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.buzzfeed.com/quizzes>`__ * **secondary url**: `<https://www.buzzfeed.com/quizzes>`__
* **test url**: `<https://www.buzzfeed.com/>`__ * **test url**: `<https://www.buzzfeed.com/>`__
* **type**: pageload * **type**: pageload
@ -7512,7 +7512,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-cnn.manifest * **playback pageset manifest**: mitm7-linux-firefox-cnn.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.cnn.com/weather>`__ * **secondary url**: `<https://www.cnn.com/weather>`__
* **test url**: `<https://www.cnn.com/2021/03/22/weather/climate-change-warm-waters-lake-michigan/index.html>`__ * **test url**: `<https://www.cnn.com/2021/03/22/weather/climate-change-warm-waters-lake-michigan/index.html>`__
* **type**: pageload * **type**: pageload
@ -8107,7 +8107,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-ebay.manifest * **playback pageset manifest**: mitm7-linux-firefox-ebay.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.ebay.com/deals>`__ * **secondary url**: `<https://www.ebay.com/deals>`__
* **test url**: `<https://www.ebay.com/>`__ * **test url**: `<https://www.ebay.com/>`__
* **type**: pageload * **type**: pageload
@ -8381,7 +8381,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-espn.manifest * **playback pageset manifest**: mitm7-linux-firefox-espn.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.espn.com/nba/draft/news>`__ * **secondary url**: `<https://www.espn.com/nba/draft/news>`__
* **test url**: `<http://www.espn.com/nba/story/_/page/allstarweekend25788027/the-comparison-lebron-james-michael-jordan-their-own-words>`__ * **test url**: `<http://www.espn.com/nba/story/_/page/allstarweekend25788027/the-comparison-lebron-james-michael-jordan-their-own-words>`__
* **type**: pageload * **type**: pageload
@ -8896,7 +8896,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-expedia.manifest * **playback pageset manifest**: mitm7-linux-firefox-expedia.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://groups.expedia.com/Group-Rate/?locale=en_US&ol=1>`__ * **secondary url**: `<https://groups.expedia.com/Group-Rate/?locale=en_US&ol=1>`__
* **test url**: `<https://expedia.com/Hotel-Search?destination=New+York%2C+New+York&latLong=40.756680%2C-73.986470&regionId=178293&startDate=&endDate=&rooms=1&_xpid=11905%7C1&adults=2>`__ * **test url**: `<https://expedia.com/Hotel-Search?destination=New+York%2C+New+York&latLong=40.756680%2C-73.986470&regionId=178293&startDate=&endDate=&rooms=1&_xpid=11905%7C1&adults=2>`__
* **type**: pageload * **type**: pageload
@ -9231,7 +9231,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm6-linux-firefox-facebook.manifest * **playback pageset manifest**: mitm6-linux-firefox-facebook.manifest
* **playback version**: 6.0.2 * **playback version**: 8.1.1
* **secondary url**: `<https://www.facebook.com/marketplace/?ref=bookmark>`__ * **secondary url**: `<https://www.facebook.com/marketplace/?ref=bookmark>`__
* **test url**: `<https://www.facebook.com>`__ * **test url**: `<https://www.facebook.com>`__
* **type**: pageload * **type**: pageload
@ -9826,7 +9826,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-fandom.manifest * **playback pageset manifest**: mitm5-linux-firefox-fandom.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase>`__ * **test url**: `<https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -10140,7 +10140,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-google-docs.manifest * **playback pageset manifest**: mitm7-linux-firefox-google-docs.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://docs.google.com/document/d/1vUnn0ePU-ynArE1OdxyEHXR2G0sl74ja_st_4OOzlgE/preview>`__ * **secondary url**: `<https://docs.google.com/document/d/1vUnn0ePU-ynArE1OdxyEHXR2G0sl74ja_st_4OOzlgE/preview>`__
* **test url**: `<https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing>`__ * **test url**: `<https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7WqIc6W5GK5M8/edit?usp=sharing>`__
* **type**: pageload * **type**: pageload
@ -10414,7 +10414,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-google-mail.manifest * **playback pageset manifest**: mitm5-linux-firefox-google-mail.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://mail.google.com/>`__ * **test url**: `<https://mail.google.com/>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -10687,7 +10687,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-google-search.manifest * **playback pageset manifest**: mitm5-linux-firefox-google-search.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://www.google.com/search?hl=en&q=barack+obama&cad=h>`__ * **test url**: `<https://www.google.com/search?hl=en&q=barack+obama&cad=h>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -11274,7 +11274,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-imdb.manifest * **playback pageset manifest**: mitm7-linux-firefox-imdb.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.imdb.com/title/tt0084967/episodes/?ref_=tt_ov_epl>`__ * **secondary url**: `<https://www.imdb.com/title/tt0084967/episodes/?ref_=tt_ov_epl>`__
* **test url**: `<https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2>`__ * **test url**: `<https://www.imdb.com/title/tt0084967/?ref_=nv_sr_2>`__
* **type**: pageload * **type**: pageload
@ -11869,7 +11869,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-imgur.manifest * **playback pageset manifest**: mitm7-linux-firefox-imgur.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **preferences**: {"media.autoplay.default": 5, "media.autoplay.ask-permission": true, "media.autoplay.blocking_policy": 1, "media.autoplay.block-webaudio": true, "media.allowed-to-play.enabled": false, "media.block-autoplay-until-in-foreground": true} * **preferences**: {"media.autoplay.default": 5, "media.autoplay.ask-permission": true, "media.autoplay.blocking_policy": 1, "media.autoplay.block-webaudio": true, "media.allowed-to-play.enabled": false, "media.block-autoplay-until-in-foreground": true}
* **secondary url**: `<https://imgur.com/gallery/L13Ci>`__ * **secondary url**: `<https://imgur.com/gallery/L13Ci>`__
* **test url**: `<https://imgur.com/gallery/m5tYJL6>`__ * **test url**: `<https://imgur.com/gallery/m5tYJL6>`__
@ -12144,7 +12144,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm6-linux-firefox-instagram.manifest * **playback pageset manifest**: mitm6-linux-firefox-instagram.manifest
* **playback version**: 6.0.2 * **playback version**: 8.1.1
* **secondary url**: `<https://www.instagram.com/nobelprize_org/>`__ * **secondary url**: `<https://www.instagram.com/nobelprize_org/>`__
* **test url**: `<https://www.instagram.com/>`__ * **test url**: `<https://www.instagram.com/>`__
* **type**: pageload * **type**: pageload
@ -12699,7 +12699,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm6-linux-firefox-linkedin.manifest * **playback pageset manifest**: mitm6-linux-firefox-linkedin.manifest
* **playback version**: 6.0.2 * **playback version**: 8.1.1
* **secondary url**: `<https://www.linkedin.com/in/thommy-harris-hk-385723106/>`__ * **secondary url**: `<https://www.linkedin.com/in/thommy-harris-hk-385723106/>`__
* **test url**: `<https://www.linkedin.com/feed/>`__ * **test url**: `<https://www.linkedin.com/feed/>`__
* **type**: pageload * **type**: pageload
@ -12973,7 +12973,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-microsoft.manifest * **playback pageset manifest**: mitm7-linux-firefox-microsoft.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://support.microsoft.com/en-us>`__ * **secondary url**: `<https://support.microsoft.com/en-us>`__
* **test url**: `<https://www.microsoft.com/en-us/>`__ * **test url**: `<https://www.microsoft.com/en-us/>`__
* **type**: pageload * **type**: pageload
@ -13247,7 +13247,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm6-linux-firefox-netflix.manifest * **playback pageset manifest**: mitm6-linux-firefox-netflix.manifest
* **playback version**: 6.0.2 * **playback version**: 8.1.1
* **secondary url**: `<https://www.netflix.com/title/699257>`__ * **secondary url**: `<https://www.netflix.com/title/699257>`__
* **test url**: `<https://www.netflix.com/title/80117263>`__ * **test url**: `<https://www.netflix.com/title/80117263>`__
* **type**: pageload * **type**: pageload
@ -13521,7 +13521,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-nytimes.manifest * **playback pageset manifest**: mitm7-linux-firefox-nytimes.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.nytimes.com/section/opinion/columnists>`__ * **secondary url**: `<https://www.nytimes.com/section/opinion/columnists>`__
* **test url**: `<https://www.nytimes.com/2020/02/19/opinion/surprise-medical-bill.html>`__ * **test url**: `<https://www.nytimes.com/2020/02/19/opinion/surprise-medical-bill.html>`__
* **type**: pageload * **type**: pageload
@ -13856,7 +13856,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-office.manifest * **playback pageset manifest**: mitm7-linux-firefox-office.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.office.com/>`__ * **secondary url**: `<https://www.office.com/>`__
* **test url**: `<https://www.office.com/launch/powerpoint?auth=1>`__ * **test url**: `<https://www.office.com/launch/powerpoint?auth=1>`__
* **type**: pageload * **type**: pageload
@ -14050,7 +14050,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-live.manifest * **playback pageset manifest**: mitm5-linux-firefox-live.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://outlook.live.com/mail/inbox>`__ * **test url**: `<https://outlook.live.com/mail/inbox>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -14323,7 +14323,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-paypal.manifest * **playback pageset manifest**: mitm5-linux-firefox-paypal.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://www.paypal.com/myaccount/summary/>`__ * **test url**: `<https://www.paypal.com/myaccount/summary/>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -14596,7 +14596,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm6-linux-firefox-pinterest.manifest * **playback pageset manifest**: mitm6-linux-firefox-pinterest.manifest
* **playback version**: 6.0.2 * **playback version**: 8.1.1
* **secondary url**: `<https://www.pinterest.com/today/best/halloween-costumes-for-your-furry-friends/75787/>`__ * **secondary url**: `<https://www.pinterest.com/today/best/halloween-costumes-for-your-furry-friends/75787/>`__
* **test url**: `<https://pinterest.com/>`__ * **test url**: `<https://pinterest.com/>`__
* **type**: pageload * **type**: pageload
@ -14870,7 +14870,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm6-linux-firefox-reddit.manifest * **playback pageset manifest**: mitm6-linux-firefox-reddit.manifest
* **playback version**: 6.0.2 * **playback version**: 8.1.1
* **secondary url**: `<https://www.reddit.com/r/technology/>`__ * **secondary url**: `<https://www.reddit.com/r/technology/>`__
* **test url**: `<https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/>`__ * **test url**: `<https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/>`__
* **type**: pageload * **type**: pageload
@ -15465,7 +15465,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm6-linux-firefox-tumblr.manifest * **playback pageset manifest**: mitm6-linux-firefox-tumblr.manifest
* **playback version**: 6.0.2 * **playback version**: 8.1.1
* **secondary url**: `<https://www.tumblr.com/tagged/funny+cats?sort=top>`__ * **secondary url**: `<https://www.tumblr.com/tagged/funny+cats?sort=top>`__
* **test url**: `<https://www.tumblr.com/dashboard>`__ * **test url**: `<https://www.tumblr.com/dashboard>`__
* **type**: pageload * **type**: pageload
@ -15739,7 +15739,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-twitch.manifest * **playback pageset manifest**: mitm7-linux-firefox-twitch.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **preferences**: {"media.autoplay.default": 5, "media.autoplay.ask-permission": true, "media.autoplay.blocking_policy": 1, "media.autoplay.block-webaudio": true, "media.allowed-to-play.enabled": false, "media.block-autoplay-until-in-foreground": true} * **preferences**: {"media.autoplay.default": 5, "media.autoplay.ask-permission": true, "media.autoplay.blocking_policy": 1, "media.autoplay.block-webaudio": true, "media.allowed-to-play.enabled": false, "media.block-autoplay-until-in-foreground": true}
* **secondary url**: `<https://www.twitch.tv/gmashley>`__ * **secondary url**: `<https://www.twitch.tv/gmashley>`__
* **test url**: `<https://www.twitch.tv/videos/894226211>`__ * **test url**: `<https://www.twitch.tv/videos/894226211>`__
@ -16014,7 +16014,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-twitter.manifest * **playback pageset manifest**: mitm5-linux-firefox-twitter.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://twitter.com/BarackObama>`__ * **test url**: `<https://twitter.com/BarackObama>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -16327,7 +16327,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-wikia.manifest * **playback pageset manifest**: mitm7-linux-firefox-wikia.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://marvel.fandom.com/wiki/Celestials>`__ * **secondary url**: `<https://marvel.fandom.com/wiki/Celestials>`__
* **test url**: `<https://marvel.fandom.com/wiki/Black_Panther>`__ * **test url**: `<https://marvel.fandom.com/wiki/Black_Panther>`__
* **type**: pageload * **type**: pageload
@ -16521,7 +16521,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-wikipedia.manifest * **playback pageset manifest**: mitm7-linux-firefox-wikipedia.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://en.wikipedia.org/wiki/Joe_Biden>`__ * **secondary url**: `<https://en.wikipedia.org/wiki/Joe_Biden>`__
* **test url**: `<https://en.wikipedia.org/wiki/Barack_Obama>`__ * **test url**: `<https://en.wikipedia.org/wiki/Barack_Obama>`__
* **type**: pageload * **type**: pageload
@ -17156,7 +17156,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm5-linux-firefox-yahoo-mail.manifest * **playback pageset manifest**: mitm5-linux-firefox-yahoo-mail.manifest
* **playback version**: 5.1.1 * **playback version**: 8.1.1
* **test url**: `<https://mail.yahoo.com/>`__ * **test url**: `<https://mail.yahoo.com/>`__
* **type**: pageload * **type**: pageload
* **unit**: ms * **unit**: ms
@ -17469,7 +17469,7 @@ Tests for page-load performance. The links direct to the actual websites that ar
* **page timeout**: 60000 * **page timeout**: 60000
* **playback**: mitmproxy * **playback**: mitmproxy
* **playback pageset manifest**: mitm7-linux-firefox-youtube.manifest * **playback pageset manifest**: mitm7-linux-firefox-youtube.manifest
* **playback version**: 7.0.4 * **playback version**: 8.1.1
* **secondary url**: `<https://www.youtube.com/watch?v=JrdEMERq8MA>`__ * **secondary url**: `<https://www.youtube.com/watch?v=JrdEMERq8MA>`__
* **test url**: `<https://www.youtube.com>`__ * **test url**: `<https://www.youtube.com>`__
* **type**: pageload * **type**: pageload

2
testing/performance/hooks_recording.py
View file

@ -116,7 +116,7 @@ def before_runs(env):
app_name = "firefox" app_name = "firefox"
name = [ name = [
"mitm7", "mitm8",
platform_name, platform_name,
"gve" if app_name == "geckoview_example" else app_name, "gve" if app_name == "geckoview_example" else app_name,
test_site["name"], test_site["name"],

2
testing/raptor/raptor/perftest.py
View file

@ -563,7 +563,7 @@ class Perftest(object):
self.config.update( self.config.update(
{ {
"playback_tool": test.get("playback"), "playback_tool": test.get("playback"),
"playback_version": test.get("playback_version", "7.0.4"), "playback_version": test.get("playback_version", "8.1.1"),
"playback_files": [ "playback_files": [
os.path.join(playback_dir, test.get("playback_pageset_manifest")) os.path.join(playback_dir, test.get("playback_pageset_manifest"))
], ],

17
testing/raptor/raptor/tests/tp6/desktop/browsertime-tp6.ini
View file

@ -17,7 +17,7 @@ page_cycles = 25
page_timeout = 60000 page_timeout = 60000
playback = mitmproxy playback = mitmproxy
playback_pageset_manifest = mitm7-linux-firefox-{subtest}.manifest playback_pageset_manifest = mitm7-linux-firefox-{subtest}.manifest
playback_version = 7.0.4 playback_version = 8.1.1
type = pageload type = pageload
unit = ms unit = ms
use_live_sites = false use_live_sites = false
@ -30,7 +30,6 @@ secondary_url = https://www.amazon.com/Acer-A515-46-R14K-Quad-Core-Processor-Bac
[bing-search] [bing-search]
playback_pageset_manifest = mitm5-linux-firefox-bing-search.manifest playback_pageset_manifest = mitm5-linux-firefox-bing-search.manifest
playback_version = 5.1.1
test_url = https://www.bing.com/search?q=barack+obama test_url = https://www.bing.com/search?q=barack+obama
[buzzfeed] [buzzfeed]
@ -55,13 +54,11 @@ test_url = https://expedia.com/Hotel-Search?destination=New+York%2C+New+York&lat
[facebook] [facebook]
playback_pageset_manifest = mitm6-linux-firefox-facebook.manifest playback_pageset_manifest = mitm6-linux-firefox-facebook.manifest
playback_version = 6.0.2
secondary_url = https://www.facebook.com/marketplace/?ref=bookmark secondary_url = https://www.facebook.com/marketplace/?ref=bookmark
test_url = https://www.facebook.com test_url = https://www.facebook.com
[fandom] [fandom]
playback_pageset_manifest = mitm5-linux-firefox-fandom.manifest playback_pageset_manifest = mitm5-linux-firefox-fandom.manifest
playback_version = 5.1.1
test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase test_url = https://www.fandom.com/articles/fallout-76-will-live-and-die-on-the-creativity-of-its-playerbase
[google-docs] [google-docs]
@ -71,12 +68,10 @@ test_url = https://docs.google.com/document/d/1US-07msg12slQtI_xchzYxcKlTs6Fp7Wq
[google-mail] [google-mail]
playback_pageset_manifest = mitm5-linux-firefox-google-mail.manifest playback_pageset_manifest = mitm5-linux-firefox-google-mail.manifest
playback_version = 5.1.1
test_url = https://mail.google.com/ test_url = https://mail.google.com/
[google-search] [google-search]
playback_pageset_manifest = mitm5-linux-firefox-google-search.manifest playback_pageset_manifest = mitm5-linux-firefox-google-search.manifest
playback_version = 5.1.1
test_url = https://www.google.com/search?hl=en&q=barack+obama&cad=h test_url = https://www.google.com/search?hl=en&q=barack+obama&cad=h
[google-slides] [google-slides]
@ -102,13 +97,11 @@ test_url = https://imgur.com/gallery/m5tYJL6
[instagram] [instagram]
playback_pageset_manifest = mitm6-linux-firefox-instagram.manifest playback_pageset_manifest = mitm6-linux-firefox-instagram.manifest
playback_version = 6.0.2
secondary_url = https://www.instagram.com/nobelprize_org/ secondary_url = https://www.instagram.com/nobelprize_org/
test_url = https://www.instagram.com/ test_url = https://www.instagram.com/
[linkedin] [linkedin]
playback_pageset_manifest = mitm6-linux-firefox-linkedin.manifest playback_pageset_manifest = mitm6-linux-firefox-linkedin.manifest
playback_version = 6.0.2
secondary_url = https://www.linkedin.com/in/thommy-harris-hk-385723106/ secondary_url = https://www.linkedin.com/in/thommy-harris-hk-385723106/
test_url = https://www.linkedin.com/feed/ test_url = https://www.linkedin.com/feed/
@ -118,7 +111,6 @@ test_url = https://www.microsoft.com/en-us/
[netflix] [netflix]
playback_pageset_manifest = mitm6-linux-firefox-netflix.manifest playback_pageset_manifest = mitm6-linux-firefox-netflix.manifest
playback_version = 6.0.2
secondary_url = https://www.netflix.com/title/699257 secondary_url = https://www.netflix.com/title/699257
test_url = https://www.netflix.com/title/80117263 test_url = https://www.netflix.com/title/80117263
@ -132,29 +124,24 @@ test_url = https://www.office.com/launch/powerpoint?auth=1
[outlook] [outlook]
playback_pageset_manifest = mitm5-linux-firefox-live.manifest playback_pageset_manifest = mitm5-linux-firefox-live.manifest
playback_version = 5.1.1
test_url = https://outlook.live.com/mail/inbox test_url = https://outlook.live.com/mail/inbox
[paypal] [paypal]
playback_pageset_manifest = mitm5-linux-firefox-paypal.manifest playback_pageset_manifest = mitm5-linux-firefox-paypal.manifest
playback_version = 5.1.1
test_url = https://www.paypal.com/myaccount/summary/ test_url = https://www.paypal.com/myaccount/summary/
[pinterest] [pinterest]
playback_pageset_manifest = mitm6-linux-firefox-pinterest.manifest playback_pageset_manifest = mitm6-linux-firefox-pinterest.manifest
playback_version = 6.0.2
secondary_url = https://www.pinterest.com/today/best/halloween-costumes-for-your-furry-friends/75787/ secondary_url = https://www.pinterest.com/today/best/halloween-costumes-for-your-furry-friends/75787/
test_url = https://pinterest.com/ test_url = https://pinterest.com/
[reddit] [reddit]
playback_pageset_manifest = mitm6-linux-firefox-reddit.manifest playback_pageset_manifest = mitm6-linux-firefox-reddit.manifest
playback_version = 6.0.2
secondary_url = https://www.reddit.com/r/technology/ secondary_url = https://www.reddit.com/r/technology/
test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/ test_url = https://www.reddit.com/r/technology/comments/9sqwyh/we_posed_as_100_senators_to_run_ads_on_facebook/
[tumblr] [tumblr]
playback_pageset_manifest = mitm6-linux-firefox-tumblr.manifest playback_pageset_manifest = mitm6-linux-firefox-tumblr.manifest
playback_version = 6.0.2
secondary_url = https://www.tumblr.com/tagged/funny+cats?sort=top secondary_url = https://www.tumblr.com/tagged/funny+cats?sort=top
test_url = https://www.tumblr.com/dashboard test_url = https://www.tumblr.com/dashboard
@ -170,7 +157,6 @@ preferences = {"media.autoplay.default": 5,
[twitter] [twitter]
playback_pageset_manifest = mitm5-linux-firefox-twitter.manifest playback_pageset_manifest = mitm5-linux-firefox-twitter.manifest
playback_version = 5.1.1
test_url = https://twitter.com/BarackObama test_url = https://twitter.com/BarackObama
[wikia] [wikia]
@ -183,7 +169,6 @@ test_url = https://en.wikipedia.org/wiki/Barack_Obama
[yahoo-mail] [yahoo-mail]
playback_pageset_manifest = mitm5-linux-firefox-yahoo-mail.manifest playback_pageset_manifest = mitm5-linux-firefox-yahoo-mail.manifest
playback_version = 5.1.1
test_url = https://mail.yahoo.com/ test_url = https://mail.yahoo.com/
[youtube] [youtube]