[tor-commits] [tor-browser-bundle-testsuite/master] Fix fp_navigator and fp_useragent tests

[gk at torproject.org]

commit 376bbd63eff6a16e4b6c810ba0594d3efe529470
Author: Alex Catarineu <acat at torproject.org>
Date:   Mon May 18 10:05:57 2020 +0200

    Fix fp_navigator and fp_useragent tests
---
 TBBTestSuite/TestSuite/BrowserBundleTests.pm      | 2 --
 marionette/tor_browser_tests/test_fp_navigator.py | 9 +++------
 marionette/tor_browser_tests/test_fp_useragent.py | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm
index 91aa6f0..4223132 100644
--- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm
+++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm
@@ -421,8 +421,6 @@ our @tests = (
         name            => 'fp_navigator',
         type            => 'marionette',
         descr           => 'Check that navigator properties are as expected',
-        # Bug 28665: temporarily disable test
-        enable          => sub { undef },
     },
     {
         name            => 'play_videos',
diff --git a/marionette/tor_browser_tests/test_fp_navigator.py b/marionette/tor_browser_tests/test_fp_navigator.py
index 0d47f82..1453b0f 100644
--- a/marionette/tor_browser_tests/test_fp_navigator.py
+++ b/marionette/tor_browser_tests/test_fp_navigator.py
@@ -15,9 +15,9 @@ nav_props = {"appCodeName": "Mozilla",
 "product": "Gecko",
 "productSub": "20100101",
 "plugins": "[object PluginArray]",
-"cookieEnabled": "true",
+"cookieEnabled": "false",
 "onLine": "true",
-"buildID": "20100101",
+"buildID": "20181001000000",
 "doNotTrack": "unspecified",
 "javaEnabled": """function javaEnabled() {
     [native code]
@@ -28,9 +28,6 @@ nav_props = {"appCodeName": "Mozilla",
 "vibrate": """function vibrate() {
     [native code]
 }""",
-"registerContentHandler": """function registerContentHandler() {
-    [native code]
-}""",
 "registerProtocolHandler": """function registerProtocolHandler() {
     [native code]
 }""",
@@ -63,7 +60,7 @@ class Test(MarionetteTestCase):
             app_version = "5.0 (Macintosh)"
             platform = "MacIntel"
             oscpu = "Intel Mac OS X 10.13"
-        nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:60.0) Gecko/20100101 Firefox/60.0"
+        nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0"
         nav_props["appVersion"] = app_version
         nav_props["platform"] = platform
         nav_props["oscpu"] = oscpu
diff --git a/marionette/tor_browser_tests/test_fp_useragent.py b/marionette/tor_browser_tests/test_fp_useragent.py
index af527c1..a2ef986 100644
--- a/marionette/tor_browser_tests/test_fp_useragent.py
+++ b/marionette/tor_browser_tests/test_fp_useragent.py
@@ -19,5 +19,5 @@ class Test(MarionetteTestCase):
                 ua_os = 'Windows NT 6.1; Win64; x64'
             if osname == 'MacOSX':
                 ua_os = 'Macintosh; Intel Mac OS X 10.13'
-            self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:60.0) Gecko/20100101 Firefox/60.0",
+            self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0",
                               js("return navigator.userAgent"))