commit 2cc266366b66aa1052b5bb288db78ad466023a2f Author: Alex Catarineu acat@torproject.org Date: Wed Nov 4 20:49:51 2020 +0100

fixup! Bug 12620: TorBrowser regression tests --- run-tbb-tests | 10 +++++++--- tbb-tests-ignore.txt | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/run-tbb-tests b/run-tbb-tests index 5e266f9ba4cd..b12e62d942c9 100755 --- a/run-tbb-tests +++ b/run-tbb-tests @@ -18,8 +18,8 @@ then echo "Using tests list from file tbb-tests-list.txt" tests=($(cat tbb-tests-list.txt)) else - ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \ - | head -1 | cut -d ' ' -f 2) + ffxbld_commit=$(git log -500 --format='oneline' | grep "TB3: Tor Browser's official .mozconfigs." \ + | head -1 | cut -d ' ' -f 1)

tests=($(git diff --name-status "$ffxbld_commit" HEAD | \ grep -e '^[AM].*/test_[^/]+.(html|xul)$' \ @@ -51,7 +51,11 @@ fi

rm -f tbb-tests.log echo $'\n''Starting tests' -./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \ +./mach mochitest --log-tbpl tbb-tests.log \ + --setpref network.file.path_blacklist='' \ + --setpref extensions.torbutton.use_nontor_proxy=true \ + --setpref browser.privatebrowsing.autostart=false \ + --setpref security.nocertdb=false \ "${tests[@]}"

echo "*************************" diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt new file mode 100644 index 000000000000..f965010a7cd4 --- /dev/null +++ b/tbb-tests-ignore.txt @@ -0,0 +1,14 @@ +browser/extensions/onboarding/test/browser/browser_onboarding_accessibility.js +browser/extensions/onboarding/test/browser/browser_onboarding_keyboard.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_2.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_3.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_4.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_5.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_click_auto_complete_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_skip_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_tours.js +browser/extensions/onboarding/test/browser/browser_onboarding_tourset.js +browser/extensions/onboarding/test/browser/browser_onboarding_uitour.js +