Commit de0bc386 authored by brizental's avatar brizental Committed by Pier Angelo Vendrame
Browse files

fixup! TB 43817: Add tests for Tor Browser 

Bug 44820: Modify mochi runtests scripts to work in Tor Browser.
parent 7c6115d3

testing/mochitest/mochitest_options.py

+15 −1
Changes for testing/mochitest/mochitest_options.py: 15 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import os 
import sys

import tempfile

from abc import ABCMeta, abstractmethod, abstractproperty

from argparse import SUPPRESS, ArgumentParser

from argparse import SUPPRESS, ArgumentParser, BooleanOptionalAction

from itertools import chain

from shutil import which

from urllib.parse import urlparse
@@ -163,6 +163,20 @@ class MochitestArguments(ArgumentContainer): 
                "help": "Only run tests of this flavor.",

            },

        ],

        [

            ["--tor-bootstrap"],

            {

                "action": BooleanOptionalAction,

                "dest": "torBootstrap",

                "default": True,

                "help": "Wait for the Tor connection to finish bootstrapping "

                "before loading the first test. The prefs/env needed for "

                "mochitest content to load at all in Tor Browser (disabling "

                "HTTPS-Only, TorDomainIsolator's non-Tor-proxy exemption, "

                "and the mock TorProvider) are applied regardless of this "

                "flag. Pass --no-tor-bootstrap to skip the wait.",

            },

        ],

        [

            ["--keep-open"],

            {

testing/mochitest/runtests.py

+5 −0
Changes for testing/mochitest/runtests.py: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2136,6 +2136,11 @@ toolbar#nav-bar { 
        # via the commandline at your own risk.

        browserEnv["XPCOM_DEBUG_BREAK"] = "stack"



        # Default to the mock Tor provider so mochitest runs

        # don't depend on a real tor daemon/network.

        # --setenv TOR_PROVIDER=... below can still override this.

        browserEnv.setdefault("TOR_PROVIDER", "mock")



        # interpolate environment passed with options

        try:

            browserEnv.update(

testing/mochitest/runtestsremote.py

+5 −0
Changes for testing/mochitest/runtestsremote.py: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -352,11 +352,16 @@ class MochiRemote(MochitestDesktop): 
        runFailures=False,

        crashAsPass=False,

        currentManifest=None,

        torBootstrap=False,

    ):

        """

        Run the app, log the duration it took to execute, return the status code.

        Kill the app if it outputs nothing for |timeout| seconds.

        """

        # torBootstrap is accepted for signature compatibility with the

        # shared doTests() call site, but not implemented here: unlike

        # MochitestDesktop.runApp, this launches the app via adb/activity

        # rather than a Marionette session, so there's nothing to wait on.



        if timeout == -1:

            timeout = self.DEFAULT_TIMEOUT