October 2020 - tbb-commits - lists.torproject.org

[tor-browser-bundle-testsuite/master] Fix dom-objects-enumeration tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 36cc780d129bd7cb9a1f47d5039918f9f759488a Author: Alex Catarineu <acat(a)torproject.org> Date: Thu May 14 16:42:41 2020 +0200 Fix dom-objects-enumeration tests - Use fixture server. - Use same method for both worker and window tests. - Require results to exactly match what we expect. --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 1 + .../test_dom-objects-enumeration-worker.py | 62 +-- .../test_dom-objects-enumeration.py | 451 ++++----------------- test-data/dom-objects-enumeration.html | 14 + test-data/dom-objects-enumeration.js | 44 ++ .../workers/dom-objects-enumeration-worker.js | 22 - test-data/workers/dom-objects-enumeration.html | 15 - test-data/workers/dom-objects-enumeration.js | 15 - 8 files changed, 188 insertions(+), 436 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 44c800e..ce5ffeb 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -829,6 +829,7 @@ sub marionette_run { system(xvfb_run($test), "$FindBin::Bin/virtualenv-marionette-5.0.0/$bin/tor-browser-tests", '--log-unittest', winpath($result_file_txt), '--log-html', winpath($result_file_html), + '--server-root', winpath("$FindBin::Bin/test-data"), '--binary', ffbin_path($tbbinfos, $test), '--profile', winpath($tbbinfos->{ffprofiledir}), $OSNAME eq 'cygwin' ? () : ('--workspace', $test->{workspace}), diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py index a22e317..59d771b 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py @@ -1,18 +1,12 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase -import testsuite - - class Test(MarionetteTestCase): def setUp(self): MarionetteTestCase.setUp(self) - ts = testsuite.TestSuite() - self.ts = ts + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) + self.test_page_file_url = self.marionette.absolute_url("dom-objects-enumeration.html?testType=worker") self.expectedObjects = [ "AbortController", @@ -21,10 +15,15 @@ class Test(MarionetteTestCase): "Array", "ArrayBuffer", "atob", + "Atomics", + "BigInt", + "BigInt64Array", + "BigUint64Array", "Blob", "Boolean", "BroadcastChannel", "btoa", + "ByteLengthQueuingStrategy", "Cache", "caches", "CacheStorage", @@ -34,7 +33,9 @@ class Test(MarionetteTestCase): "CloseEvent", "console", "constructor", + "CountQueuingStrategy", "createImageBitmap", + "crossOriginIsolated", "crypto", "Crypto", "CustomEvent", @@ -47,9 +48,14 @@ class Test(MarionetteTestCase): "__defineSetter__", "Directory", "dispatchEvent", - "DOMCursor", - "DOMError", "DOMException", + "DOMMatrix", + "DOMMatrixReadOnly", + "DOMPoint", + "DOMPointReadOnly", + "DOMQuad", + "DOMRect", + "DOMRectReadOnly", "DOMRequest", "DOMStringList", "dump", @@ -72,7 +78,7 @@ class Test(MarionetteTestCase): "Float64Array", "FormData", "Function", - "getAllPropertyNames", + "globalThis", "hasOwnProperty", "Headers", "IDBCursor", @@ -101,13 +107,14 @@ class Test(MarionetteTestCase): "isNaN", "isPrototypeOf", "isSecureContext", - "Iterator", "JSON", "location", "__lookupGetter__", "__lookupSetter__", "Map", "Math", + "MediaCapabilities", + "MediaCapabilitiesInfo", "MessageChannel", "MessageEvent", "MessagePort", @@ -117,12 +124,14 @@ class Test(MarionetteTestCase): "Notification", "Number", "Object", - "onclose", "onerror", + "onlanguagechange", "onmessage", "onmessageerror", "onoffline", "ononline", + "onrejectionhandled", + "onunhandledrejection", "origin", "parseFloat", "parseInt", @@ -134,13 +143,17 @@ class Test(MarionetteTestCase): "PerformanceObserver", "PerformanceObserverEntryList", "PerformanceResourceTiming", + "PerformanceServerTiming", "postMessage", "ProgressEvent", "Promise", + "PromiseRejectionEvent", "propertyIsEnumerable", "__proto__", "Proxy", + "queueMicrotask", "RangeError", + "ReadableStream", "ReferenceError", "Reflect", "RegExp", @@ -151,7 +164,6 @@ class Test(MarionetteTestCase): "Set", "setInterval", "setTimeout", - "StopIteration", "StorageManager", "String", "SubtleCrypto", @@ -160,7 +172,6 @@ class Test(MarionetteTestCase): "TextDecoder", "TextEncoder", "toLocaleString", - "toSource", "toString", "TypeError", "Uint16Array", @@ -169,13 +180,10 @@ class Test(MarionetteTestCase): "Uint8ClampedArray", "undefined", "unescape", - "uneval", - "unwatch", "URIError", "URL", "URLSearchParams", "valueOf", - "watch", "WeakMap", "WeakSet", "WebAssembly", @@ -191,14 +199,13 @@ class Test(MarionetteTestCase): def test_dom_objects_enumeration_workers(self): with self.marionette.using_context('content'): - URL = "file://%s/workers/dom-objects-enumeration.html" % self.ts.t['options']['test_data_dir'] - self.marionette.navigate(URL) - self.marionette.set_search_timeout(50000) + self.marionette.navigate(self.test_page_file_url) + self.marionette.timeout.implicit = 5 elt = self.marionette.find_element('id', 'enumeration') - + r = elt.text.split("\n") err = False unknown_objects = '' - for l in elt.text.split("\n"): + for l in r: if l in self.expectedObjects: continue err = True @@ -206,3 +213,12 @@ class Test(MarionetteTestCase): err_msg = "Unknown objects:\n%s" % unknown_objects self.assertFalse(err, msg=err_msg) + + for l in self.expectedObjects: + if l in r: + continue + err = True + unknown_objects += l + "\n" + + err_msg = "Expected objects not found:\n%s" % unknown_objects + self.assertFalse(err, msg=err_msg) \ No newline at end of file diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py index 84b58f5..be2ae65 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py @@ -9,79 +9,49 @@ from marionette_driver.errors import MarionetteException from marionette_harness import MarionetteTestCase -import testsuite - - class Test(MarionetteTestCase): - def setUp(self): MarionetteTestCase.setUp(self) - - ts = testsuite.TestSuite() - self.ts = ts - + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) + self.test_page_file_url = self.marionette.absolute_url("dom-objects-enumeration.html?testType=window") # The list of expected DOM objects - self.interfaceNamesInGlobalScope = [ + self.expectedObjects = [ "AbortController", "AbortSignal", + "AbstractRange", "addEventListener", - "adjustToolbarIconArrow", "alert", - "AnalyserNode", "Animation", "AnimationEffect", "AnimationEvent", - "AnimationPlayer", + "AnimationPlaybackEvent", "AnimationTimeline", - "AnonymousContent", - "Application", - "applicationCache", - "ArchiveRequest", "Array", "ArrayBuffer", - "AsyncScrollEventDetail", "atob", + "Atomics", "Attr", "Audio", - "AudioBuffer", - "AudioBufferSourceNode", - "AudioContext", - "AudioDestinationNode", - "AudioListener", - "AudioNode", - "AudioParam", - "AudioProcessingEvent", + "AudioParamMap", "AudioScheduledSourceNode", - "AudioStreamTrack", - "back", + "AudioWorklet", + "AudioWorkletNode", "BarProp", "BaseAudioContext", - "BatteryManager", "BeforeUnloadEvent", - "BiquadFilterNode", + "BigInt", + "BigInt64Array", + "BigUint64Array", "Blob", "BlobEvent", "blur", "Boolean", - "BoxObject", "BroadcastChannel", - "BrowserFeedWriter", "btoa", + "ByteLengthQueuingStrategy", "Cache", "caches", "CacheStorage", - "CameraCapabilities", - "CameraClosedEvent", - "CameraConfigurationEvent", - "CameraControl", - "CameraDetectedFace", - "CameraFacesDetectedEvent", - "CameraManager", - "CameraRecorderAudioProfile", - "CameraRecorderProfile", - "CameraRecorderProfiles", - "CameraRecorderVideoProfile", - "CameraStateChangeEvent", "cancelAnimationFrame", "cancelIdleCallback", "CanvasCaptureMediaStream", @@ -91,77 +61,51 @@ class Test(MarionetteTestCase): "captureEvents", "CaretPosition", "CDATASection", - "ChannelMergerNode", - "ChannelSplitterNode", "CharacterData", - "ChromeMessageBroadcaster", - "ChromeMessageSender", - "ChromeWindow", - "ChromeWorker", "clearInterval", "clearTimeout", - "ClientInformation", - "ClientRect", - "ClientRectList", + "Clipboard", "ClipboardEvent", "close", "closed", "CloseEvent", - "CommandEvent", "Comment", - "Components", "CompositionEvent", "confirm", "console", - "Console", - "Contact", - "ContactManager", - "_content", + "constructor", "content", - "ContentFrameMessageManager", - "ContentProcessMessageManager", - "controllers", - "Controllers", - "ConvolverNode", - "Counter", + "CountQueuingStrategy", "createImageBitmap", - "CRMFObject", + "crossOriginIsolated", "crypto", "Crypto", - "CryptoDialogs", "CryptoKey", "CSS", "CSS2Properties", - "CSSCharsetRule", + "CSSAnimation", "CSSConditionRule", "CSSCounterStyleRule", "CSSFontFaceRule", "CSSFontFeatureValuesRule", "CSSGroupingRule", - "CSSGroupRuleRuleList", "CSSImportRule", "CSSKeyframeRule", "CSSKeyframesRule", "CSSMediaRule", "CSSMozDocumentRule", "CSSNamespaceRule", - "CSSNameSpaceRule", "CSSPageRule", - "CSSPrimitiveValue", - "CSSRect", "CSSRule", "CSSRuleList", "CSSStyleDeclaration", "CSSStyleRule", "CSSStyleSheet", "CSSSupportsRule", - "CSSUnknownRule", - "CSSValue", - "CSSValueList", + "CSSTransition", + "CustomElementRegistry", + "customElements", "CustomEvent", - "DataChannel", - "DataContainerEvent", - "DataErrorEvent", "DataTransfer", "DataTransferItem", "DataTransferItemList", @@ -169,37 +113,22 @@ class Test(MarionetteTestCase): "Date", "decodeURI", "decodeURIComponent", - "DelayNode", - "DesktopNotification", - "DesktopNotificationCenter", - "DeviceAcceleration", - "DeviceLightEvent", + "__defineGetter__", + "__defineSetter__", "DeviceMotionEvent", "DeviceOrientationEvent", "devicePixelRatio", - "DeviceProximityEvent", - "DeviceRotationRate", - "DeviceStorage", - "DeviceStorageChangeEvent", - "DeviceStorageCursor", "Directory", "dispatchEvent", "document", "Document", "DocumentFragment", - "DocumentTouch", + "DocumentTimeline", "DocumentType", - "DocumentXBL", - "DOMApplication", - "DOMApplicationsManager", - "DOMConstructor", - "DOMCursor", - "DOMError", "DOMException", "DOMImplementation", "DOMMatrix", "DOMMatrixReadOnly", - "DOMMMIError", "DOMParser", "DOMPoint", "DOMPointReadOnly", @@ -208,18 +137,12 @@ class Test(MarionetteTestCase): "DOMRectList", "DOMRectReadOnly", "DOMRequest", - "DOMSettableTokenList", "DOMStringList", "DOMStringMap", "DOMTokenList", - "DOMTransactionEvent", "DragEvent", "dump", - "DynamicsCompressorNode", "Element", - "ElementCSSInlineStyle", - "ElementReplaceEvent", - "ElementTimeControl", "encodeURI", "encodeURIComponent", "Error", @@ -227,19 +150,15 @@ class Test(MarionetteTestCase): "escape", "eval", "EvalError", + "event", "Event", - "EventListener", - "EventListenerInfo", "EventSource", "EventTarget", "external", - "External", "fetch", "File", - "FileHandle", "FileList", "FileReader", - "FileRequest", "FileSystem", "FileSystemDirectoryEntry", "FileSystemDirectoryReader", @@ -251,56 +170,42 @@ class Test(MarionetteTestCase): "focus", "FocusEvent", "FontFace", - "FontFaceList", "FontFaceSet", "FontFaceSetLoadEvent", "FormData", - "forward", + "FormDataEvent", "frameElement", "frames", "fullScreen", "Function", - "FutureResolver", - "GainNode", "Gamepad", - "GamepadAxisMoveEvent", - "GamepadButtonEvent", + "GamepadButton", "GamepadEvent", "GamepadHapticActuator", "GamepadPose", - "GeoGeolocation", - "GeoPosition", - "GeoPositionCallback", - "GeoPositionCoords", - "GeoPositionError", - "GeoPositionErrorCallback", + "Geolocation", + "GeolocationCoordinates", + "GeolocationPosition", + "GeolocationPositionError", "getComputedStyle", "getDefaultComputedStyle", - "getInterface", "getSelection", - "GetUserMediaErrorCallback", - "GetUserMediaSuccessCallback", - "GlobalObjectConstructor", - "GlobalPropertyInitializer", + "globalThis", "HashChangeEvent", + "hasOwnProperty", "Headers", "history", "History", - "home", "HTMLAllCollection", "HTMLAnchorElement", - "HTMLAppletElement", "HTMLAreaElement", "HTMLAudioElement", "HTMLBaseElement", "HTMLBodyElement", "HTMLBRElement", "HTMLButtonElement", - "HTMLByteRanges", "HTMLCanvasElement", "HTMLCollection", - "HTMLCommandElement", - "HTMLContentElement", "HTMLDataElement", "HTMLDataListElement", "HTMLDetailsElement", @@ -328,6 +233,7 @@ class Test(MarionetteTestCase): "HTMLLIElement", "HTMLLinkElement", "HTMLMapElement", + "HTMLMarqueeElement", "HTMLMediaElement", "HTMLMenuElement", "HTMLMenuItemElement", @@ -345,11 +251,10 @@ class Test(MarionetteTestCase): "HTMLPictureElement", "HTMLPreElement", "HTMLProgressElement", - "HTMLPropertiesCollection", "HTMLQuoteElement", "HTMLScriptElement", "HTMLSelectElement", - "HTMLShadowElement", + "HTMLSlotElement", "HTMLSourceElement", "HTMLSpanElement", "HTMLStyleElement", @@ -386,15 +291,12 @@ class Test(MarionetteTestCase): "ImageBitmap", "ImageBitmapRenderingContext", "ImageData", - "ImageDocument", "indexedDB", "Infinity", "innerHeight", "innerWidth", "InputEvent", - "insertPropertyStrings", "InstallTrigger", - "InstallTriggerImpl", "Int16Array", "Int32Array", "Int8Array", @@ -404,105 +306,54 @@ class Test(MarionetteTestCase): "Intl", "isFinite", "isNaN", + "isPrototypeOf", "isSecureContext", - "Iterator", "JSON", - "JSWindow", "KeyboardEvent", "KeyEvent", + "KeyframeEffect", "length", - "LinkStyle", - "LoadStatus", - "LocalMediaStream", "localStorage", "location", "Location", "locationbar", - "LockedFile", - "LSProgressEvent", + "__lookupGetter__", + "__lookupSetter__", "Map", "matchMedia", "Math", - "MediaElementAudioSourceNode", + "MathMLElement", + "MediaCapabilities", + "MediaCapabilitiesInfo", "MediaEncryptedEvent", "MediaError", - "MediaKeys", "MediaKeyError", "MediaKeyMessageEvent", + "MediaKeys", "MediaKeySession", "MediaKeyStatusMap", "MediaKeySystemAccess", "MediaList", "MediaQueryList", "MediaQueryListEvent", - "MediaQueryListListener", "MediaRecorder", "MediaRecorderErrorEvent", "MediaSource", "MediaStream", - "MediaStreamAudioDestinationNode", - "MediaStreamAudioSourceNode", "MediaStreamTrack", "MediaStreamTrackEvent", "menubar", - "MenuBoxObject", "MessageChannel", "MessageEvent", "MessagePort", "MimeType", "MimeTypeArray", - "ModalContentWindow", "MouseEvent", "MouseScrollEvent", "moveBy", "moveTo", - "MozAlarmsManager", - "mozAnimationStartTime", - "MozApplicationEvent", - "MozBlobBuilder", - "MozBrowserFrame", - "mozCancelAnimationFrame", - "mozCancelRequestAnimationFrame", - "MozCanvasPrintState", - "MozConnection", - "mozContact", - "MozContactChangeEvent", - "MozCSSKeyframeRule", - "MozCSSKeyframesRule", - "mozIndexedDB", "mozInnerScreenX", "mozInnerScreenY", - "MozMmsEvent", - "MozMmsMessage", - "MozMobileCellInfo", - "MozMobileConnectionInfo", - "MozMobileMessageManager", - "MozMobileMessageThread", - "MozMobileNetworkInfo", - "MozNamedAttrMap", - "MozNavigatorMobileMessage", - "MozNavigatorNetwork", - "MozNavigatorSms", - "MozNavigatorTime", - "MozNetworkStats", - "MozNetworkStatsData", - "MozNetworkStatsManager", - "mozPaintCount", - "MozPowerManager", - "mozRequestAnimationFrame", - "mozRequestOverfill", - "MozSelfSupport", - "MozSettingsEvent", - "MozSettingsTransactionEvent", - "MozSmsEvent", - "MozSmsFilter", - "MozSmsManager", - "MozSmsMessage", - "MozSmsSegmentInfo", - "MozTimeManager", - "MozTouchEvent", - "MozWakeLock", - "MozWakeLockListener", "MutationEvent", "MutationObserver", "MutationRecord", @@ -511,30 +362,15 @@ class Test(MarionetteTestCase): "NaN", "navigator", "Navigator", - "NavigatorCamera", - "NavigatorDesktopNotification", - "NavigatorDeviceStorage", - "NavigatorGeolocation", - "NavigatorUserMedia", "netscape", "Node", "NodeFilter", "NodeIterator", "NodeList", - "NodeSelector", - "__noscriptStorage", "Notification", - "NotifyAudioAvailableEvent", "NotifyPaintEvent", - "NSEditableElement", - "NSEvent", - "NSRGBAColor", - "NSXPathExpression", "Number", "Object", - "OfflineAudioCompletionEvent", - "OfflineAudioContext", - "OfflineResourceList", "onabort", "onabsolutedeviceorientation", "onafterprint", @@ -552,6 +388,7 @@ class Test(MarionetteTestCase): "onclick", "onclose", "oncontextmenu", + "oncuechange", "ondblclick", "ondevicelight", "ondevicemotion", @@ -570,7 +407,7 @@ class Test(MarionetteTestCase): "onended", "onerror", "onfocus", - "ongotpointercapture", + "onformdata", "onhashchange", "oninput", "oninvalid", @@ -579,12 +416,10 @@ class Test(MarionetteTestCase): "onkeyup", "onlanguagechange", "onload", - "onLoad", "onloadeddata", "onloadedmetadata", "onloadend", "onloadstart", - "onlostpointercapture", "onmessage", "onmessageerror", "onmousedown", @@ -596,8 +431,6 @@ class Test(MarionetteTestCase): "onmouseup", "onmozfullscreenchange", "onmozfullscreenerror", - "onmozpointerlockchange", - "onmozpointerlockerror", "onoffline", "ononline", "onpagehide", @@ -605,17 +438,10 @@ class Test(MarionetteTestCase): "onpause", "onplay", "onplaying", - "onpointercancel", - "onpointerdown", - "onpointerenter", - "onpointerleave", - "onpointermove", - "onpointerout", - "onpointerover", - "onpointerup", "onpopstate", "onprogress", "onratechange", + "onrejectionhandled", "onreset", "onresize", "onscroll", @@ -634,6 +460,7 @@ class Test(MarionetteTestCase): "ontransitionend", "ontransitionrun", "ontransitionstart", + "onunhandledrejection", "onunload", "onuserproximity", "onvolumechange", @@ -644,12 +471,9 @@ class Test(MarionetteTestCase): "onwebkittransitionend", "onwheel", "open", - "openDialog", "opener", - "OpenWindowEventDetail", "Option", "origin", - "OscillatorNode", "outerHeight", "outerWidth", "PageTransitionEvent", @@ -657,79 +481,64 @@ class Test(MarionetteTestCase): "pageYOffset", "PaintRequest", "PaintRequestList", - "PannerNode", "parent", "parseFloat", "parseInt", - "Parser", - "ParserJS", "Path2D", - "PaymentRequestInfo", "performance", "Performance", "PerformanceEntry", "PerformanceMark", "PerformanceMeasure", "PerformanceNavigation", - "PerformanceNavigationTiming", "PerformanceObserver", "PerformanceObserverEntryList", "PerformanceResourceTiming", + "PerformanceServerTiming", "PerformanceTiming", - "PeriodicWave", "Permissions", - "PermissionSettings", "PermissionStatus", "personalbar", - "PhoneNumberService", - "Pkcs11", "Plugin", "PluginArray", - "PluginCrashedEvent", - "PointerEvent", "PopStateEvent", "PopupBlockedEvent", - "PopupBoxObject", "postMessage", "print", "ProcessingInstruction", "ProgressEvent", "Promise", - "PromiseDebugging", + "PromiseRejectionEvent", "prompt", - "PropertyNodeList", + "propertyIsEnumerable", + "__proto__", "Proxy", - "PushManager", - "QueryInterface", + "queueMicrotask", "RadioNodeList", "Range", "RangeError", - "realFrameElement", - "RecordErrorEvent", - "Rect", + "ReadableStream", "ReferenceError", + "Reflect", "RegExp", "releaseEvents", "removeEventListener", "Request", "requestAnimationFrame", "requestIdleCallback", - "RequestService", "resizeBy", + "ResizeObserver", + "ResizeObserverEntry", + "ResizeObserverSize", "resizeTo", "Response", - "RGBColor", - "RTCIceCandidate", - "RTCPeerConnection", - "RTCPeerConnectionIdentityErrorEvent", - "RTCPeerConnectionIdentityEvent", - "RTCSessionDescription", "screen", "Screen", + "screenLeft", "ScreenOrientation", + "screenTop", "screenX", "screenY", - "ScriptProcessorNode", "scroll", "ScrollAreaEvent", "scrollbars", @@ -739,53 +548,41 @@ class Test(MarionetteTestCase): "scrollMaxX", "scrollMaxY", "scrollTo", - "ScrollViewChangeEvent", "scrollX", "scrollY", + "SecurityPolicyViolationEvent", "Selection", - "SelectionStateChangedEvent", "self", - "Serializer", - "Services", "sessionStorage", "Set", "setInterval", "setResizable", "setTimeout", - "SettingsLock", - "SettingsManager", + "ShadowRoot", "SharedWorker", - "showModalDialog", "sidebar", - "SimpleGestureEvent", "sizeToContent", - "SmartCardEvent", "SourceBuffer", "SourceBufferList", - "SpeechRecognitionError", - "SpeechRecognitionEvent", "speechSynthesis", + "SpeechSynthesis", + "SpeechSynthesisErrorEvent", "SpeechSynthesisEvent", + "SpeechSynthesisUtterance", + "SpeechSynthesisVoice", + "StaticRange", "status", "statusbar", - "StereoPannerNode", "stop", - "StopIteration", "Storage", "StorageEvent", - "StorageIndexedDB", - "StorageItem", "StorageManager", - "StorageObsolete", "String", - "StyleRuleChangeEvent", "StyleSheet", - "StyleSheetApplicableStateChangeEvent", - "StyleSheetChangeEvent", "StyleSheetList", + "SubmitEvent", "SubtleCrypto", "SVGAElement", - "SVGAltGlyphElement", "SVGAngle", "SVGAnimatedAngle", "SVGAnimatedBoolean", @@ -795,8 +592,6 @@ class Test(MarionetteTestCase): "SVGAnimatedLengthList", "SVGAnimatedNumber", "SVGAnimatedNumberList", - "SVGAnimatedPathData", - "SVGAnimatedPoints", "SVGAnimatedPreserveAspectRatio", "SVGAnimatedRect", "SVGAnimatedString", @@ -810,10 +605,8 @@ class Test(MarionetteTestCase): "SVGComponentTransferFunctionElement", "SVGDefsElement", "SVGDescElement", - "SVGDocument", "SVGElement", "SVGEllipseElement", - "SVGEvent", "SVGFEBlendElement", "SVGFEColorMatrixElement", "SVGFEComponentTransferElement", @@ -840,8 +633,6 @@ class Test(MarionetteTestCase): "SVGFETileElement", "SVGFETurbulenceElement", "SVGFilterElement", - "SVGFilterPrimitiveStandardAttributes", - "SVGFitToViewBox", "SVGForeignObjectElement", "SVGGElement", "SVGGeometryElement", @@ -852,37 +643,15 @@ class Test(MarionetteTestCase): "SVGLengthList", "SVGLinearGradientElement", "SVGLineElement", - "SVGLocatable", "SVGMarkerElement", "SVGMaskElement", "SVGMatrix", "SVGMetadataElement", - "SVGMpathElement", "SVGMPathElement", "SVGNumber", "SVGNumberList", "SVGPathElement", - "SVGPathSeg", - "SVGPathSegArcAbs", - "SVGPathSegArcRel", - "SVGPathSegClosePath", - "SVGPathSegCurvetoCubicAbs", - "SVGPathSegCurvetoCubicRel", - "SVGPathSegCurvetoCubicSmoothAbs", - "SVGPathSegCurvetoCubicSmoothRel", - "SVGPathSegCurvetoQuadraticAbs", - "SVGPathSegCurvetoQuadraticRel", - "SVGPathSegCurvetoQuadraticSmoothAbs", - "SVGPathSegCurvetoQuadraticSmoothRel", - "SVGPathSegLinetoAbs", - "SVGPathSegLinetoHorizontalAbs", - "SVGPathSegLinetoHorizontalRel", - "SVGPathSegLinetoRel", - "SVGPathSegLinetoVerticalAbs", - "SVGPathSegLinetoVerticalRel", "SVGPathSegList", - "SVGPathSegMovetoAbs", - "SVGPathSegMovetoRel", "SVGPatternElement", "SVGPoint", "SVGPointList", @@ -896,31 +665,23 @@ class Test(MarionetteTestCase): "SVGSetElement", "SVGStopElement", "SVGStringList", - "SVGStylable", "SVGStyleElement", "SVGSVGElement", "SVGSwitchElement", "SVGSymbolElement", - "SVGTests", "SVGTextContentElement", "SVGTextElement", "SVGTextPathElement", "SVGTextPositioningElement", "SVGTitleElement", "SVGTransform", - "SVGTransformable", "SVGTransformList", "SVGTSpanElement", "SVGUnitTypes", - "SVGURIReference", "SVGUseElement", "SVGViewElement", - "SVGViewSpec", - "SVGZoomAndPan", - "SVGZoomEvent", "Symbol", "SyntaxError", - "TCPSocket", "Text", "TextDecoder", "TextEncoder", @@ -931,45 +692,36 @@ class Test(MarionetteTestCase): "TextTrackList", "TimeEvent", "TimeRanges", + "toLocaleString", "toolbar", "top", - "toStaticHTML", - "ToString", - "Touch", - "TouchEvent", - "TouchList", + "toString", "TrackEvent", "TransitionEvent", - "TreeColumn", - "TreeColumns", - "TreeContentView", - "TreeSelection", "TreeWalker", "TypeError", + "u2f", + "U2F", "UIEvent", "Uint16Array", "Uint32Array", "Uint8Array", "Uint8ClampedArray", "undefined", - "UndoManager", "unescape", - "uneval", "updateCommands", "URIError", "URL", "URLSearchParams", - "UserDataHandler", - "UserProximityEvent", - "USSDReceivedEvent", "ValidityState", + "valueOf", "VideoPlaybackQuality", - "VideoStreamTrack", + "VisualViewport", "VTTCue", "VTTRegion", - "WaveShaperNode", "WeakMap", "WeakSet", + "WebAssembly", "WebGLActiveInfo", "WebGLBuffer", "WebGLContextEvent", @@ -982,68 +734,36 @@ class Test(MarionetteTestCase): "WebGLShaderPrecisionFormat", "WebGLTexture", "WebGLUniformLocation", - "WebGLVertexArray", "WebGLVertexArrayObject", "WebKitCSSMatrix", + "webkitURL", "WebSocket", "WheelEvent", "window", "Window", - "WindowCollection", - "WindowInternal", - "WindowPerformance", - "WindowRoot", - "WindowUtils", "Worker", - "__XBLClassObjectMap__", + "Worklet", "XMLDocument", "XMLHttpRequest", "XMLHttpRequestEventTarget", "XMLHttpRequestUpload", "XMLSerializer", - "XMLStylesheetProcessingInstruction", "XPathEvaluator", "XPathExpression", - "XPathNamespace", - "XPathNSResolver", "XPathResult", - "XPCNativeWrapper", "XSLTProcessor", - "XULButtonElement", - "XULCheckboxElement", - "XULCommandDispatcher", - "XULCommandEvent", - "XULContainerElement", - "XULContainerItemElement", - "XULControlElement", - "XULControllers", - "XULDescriptionElement", - "XULDocument", - "XULElement", - "XULImageElement", - "XULLabeledControlElement", - "XULLabelElement", - "XULMenuListElement", - "XULMultiSelectControlElement", - "XULPopupElement", - "XULRelatedElement", - "XULSelectControlElement", - "XULSelectControlItemElement", - "XULTemplateBuilder", - "XULTextBoxElement", - "XULTreeBuilder", - "XULTreeElement", ] def test_dom_objects_enumeration(self): with self.marionette.using_context('content'): - self.marionette.navigate('about:robots') - - r = self.marionette.execute_script('return Object.getOwnPropertyNames(window);') + self.marionette.navigate(self.test_page_file_url) + self.marionette.timeout.implicit = 5 + elt = self.marionette.find_element('id', 'enumeration') + r = elt.text.split("\n") err = False unknown_objects = '' for l in r: - if l in self.interfaceNamesInGlobalScope: + if l in self.expectedObjects: continue err = True unknown_objects += l + "\n" @@ -1051,3 +771,12 @@ class Test(MarionetteTestCase): err_msg = "Unknown objects:\n%s" % unknown_objects self.assertFalse(err, msg=err_msg) + for l in self.expectedObjects: + if l in r: + continue + err = True + unknown_objects += l + "\n" + + err_msg = "Expected objects not found:\n%s" % unknown_objects + self.assertFalse(err, msg=err_msg) + diff --git a/test-data/dom-objects-enumeration.html b/test-data/dom-objects-enumeration.html new file mode 100644 index 0000000..1f7e6c0 --- /dev/null +++ b/test-data/dom-objects-enumeration.html @@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8"> + + <title>dom objects enumeration</title> + </head> + + <body> + <h1>dom objects enumeration</h1> + <script src="dom-objects-enumeration.js"></script> + </body> +</html> + diff --git a/test-data/dom-objects-enumeration.js b/test-data/dom-objects-enumeration.js new file mode 100644 index 0000000..b3e60c5 --- /dev/null +++ b/test-data/dom-objects-enumeration.js @@ -0,0 +1,44 @@ +(() => { + // getAllPropertyNames function taken from: + // https://stackoverflow.com/questions/8024149/is-it-possible-to-get-the-non-e… + function getAllPropertyNames(obj) { + const props = []; + do { + Object.getOwnPropertyNames(obj).forEach((prop) => { + if (props.indexOf(prop) === -1) { + props.push(prop); + } + }); + } while (obj = Object.getPrototypeOf(obj)); + return [...new Set(props)].sort(); + } + + function getGlobalNames() { + return getAllPropertyNames(globalThis); + } + + if (!self.document) { + // This is a worker + self.postMessage(getGlobalNames()); + } else { + // Not a worker, loaded via script. + const enumeration = document.createElement("div"); + enumeration.setAttribute("id", "enumeration"); + const queryString = window.location.search; + const urlParams = new URLSearchParams(queryString); + let onmessage = (allObjects) => { + for (const name of allObjects) { + enumeration.innerHTML += name + "<br/>"; + } + document.getElementsByTagName("body")[0].appendChild(enumeration); + }; + if (urlParams.get("testType") === "worker") { + // Must enumerate worker globals + const worker = new Worker("dom-objects-enumeration.js"); + worker.onmessage = (e) => onmessage(e.data); + } else { + // Must enumerate window global + onmessage(getGlobalNames()); + } + } +})(); \ No newline at end of file diff --git a/test-data/workers/dom-objects-enumeration-worker.js b/test-data/workers/dom-objects-enumeration-worker.js deleted file mode 100644 index 5ab3723..0000000 --- a/test-data/workers/dom-objects-enumeration-worker.js +++ /dev/null @@ -1,22 +0,0 @@ -// getAllPropertyNames function taken from: -// https://stackoverflow.com/questions/8024149/is-it-possible-to-get-the-non-e… -function getAllPropertyNames( obj ) { - var props = []; - do { - Object.getOwnPropertyNames( obj ).forEach(function ( prop ) { - if ( props.indexOf( prop ) === -1 ) { - props.push( prop ); - } - }); - } while ( obj = Object.getPrototypeOf( obj ) ); - return props; -} - -onmessage = function(e) { - var allObjects = getAllPropertyNames(self); - var res = Array(); - for (var i in allObjects.sort()) { - res.push(allObjects[i]); - } - postMessage(res); -} diff --git a/test-data/workers/dom-objects-enumeration.html b/test-data/workers/dom-objects-enumeration.html deleted file mode 100644 index 6a2fc19..0000000 --- a/test-data/workers/dom-objects-enumeration.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="utf-8"> - - <title>Web Workers dom objects enumeration</title> - </head> - - <body> - <h1>Web Workers dom objects enumeration</h1> - - </body> - <script src="dom-objects-enumeration.js"></script> -</html> - diff --git a/test-data/workers/dom-objects-enumeration.js b/test-data/workers/dom-objects-enumeration.js deleted file mode 100644 index 56d4a64..0000000 --- a/test-data/workers/dom-objects-enumeration.js +++ /dev/null @@ -1,15 +0,0 @@ -var enumeration = document.createElement('div'); -enumeration.setAttribute("id", "enumeration"); - -if (window.Worker) { - var myWorker = new Worker("dom-objects-enumeration-worker.js"); - myWorker.postMessage("Hello"); - myWorker.onmessage = function(e) { - var allObjects = e.data; - for (var i in allObjects.sort()) { - var name = allObjects[i]; - enumeration.innerHTML += name + "<br/>"; - } - document.getElementsByTagName("body")[0].appendChild(enumeration); - } -}

1 0

[tor-browser-bundle-testsuite/master] Fix pinning test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit eae3202691b96fc3d39e952eb0ca6a3d67dd28be Author: Alex Catarineu <acat(a)torproject.org> Date: Fri May 15 13:48:05 2020 +0200 Fix pinning test --- marionette/tor_browser_tests/test_pinning.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/marionette/tor_browser_tests/test_pinning.py b/marionette/tor_browser_tests/test_pinning.py index dc66236..23e029c 100644 --- a/marionette/tor_browser_tests/test_pinning.py +++ b/marionette/tor_browser_tests/test_pinning.py @@ -1,10 +1,7 @@ -from marionette_driver import By, Actions -from marionette_driver.errors import MarionetteException, JavascriptException - from marionette_harness import MarionetteTestCase import testsuite - +import json class Test(MarionetteTestCase): @@ -31,8 +28,8 @@ class Test(MarionetteTestCase): self.assertTrue(res, msg="Page could be loaded") if res: - errorCode = m.find_element('id', 'errorCode') - self.assertEqual(errorCode.get_attribute('title'), + errorCode = m.find_element('id', 'errorShortDescText2') + self.assertEqual(json.loads(errorCode.get_attribute('data-l10n-args'))["error"], 'MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE', msg='Wrong error code')

1 0

[tor-browser-bundle-testsuite/master] Fix performance-observer test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 1b30b27ffd9af1ef9a0a6bd81e3c1247a7e96637 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 08:56:21 2020 +0200 Fix performance-observer test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 7 ---- .../tor_browser_tests/test_performance-observer.py | 38 ++++++++++++---------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index e35e903..0bf4359 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -380,13 +380,6 @@ our @tests = ( type => 'marionette', descr => 'Check that the Performance Observer API is really disabled', use_net => 1, - # To check that the test fails when performance observer is enabled, - # uncomment this: - #prefs => { - # 'dom.enable_performance_observer' => 'true', - #}, - # Bug 27137: temporarily disable test - enable => sub { undef }, }, { name => 'searchengines', diff --git a/marionette/tor_browser_tests/test_performance-observer.py b/marionette/tor_browser_tests/test_performance-observer.py index 31c3c5f..b727a01 100644 --- a/marionette/tor_browser_tests/test_performance-observer.py +++ b/marionette/tor_browser_tests/test_performance-observer.py @@ -4,9 +4,6 @@ # Setting |dom.enable_performance_observer| to |false| and testing that # might not be sufficient. -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): @@ -19,18 +16,25 @@ class Test(MarionetteTestCase): def test_performance_observer(self): + def is_perf_obs_working(marionette): + return self.marionette.execute_async_script(""" + let [resolve] = arguments; + var observer = new PerformanceObserver(function(...args) { resolve(true); }); + observer.observe({entryTypes: ['resource', 'mark', 'measure']}); + performance.mark("hello"); + setTimeout(function() { + resolve(false); + }, 2000); + """) + with self.marionette.using_context('content'): - self.marionette.navigate(self.TEST_URL) - - err_msg = 'performance observer is working' - self.assertTrue(self.marionette.execute_script(""" - var pass = false; - try { - var observer = new PerformanceObserver(function(list) { }); - observer.observe({entryTypes: ['resource', 'mark', 'measure']}); - } catch (e) { - pass = true; - } - return pass; - """), - msg=err_msg) + m = self.marionette + m.navigate(self.TEST_URL) + m.timeout.script = 10 + + # Performance observer should not work with default settings + self.assertFalse(is_perf_obs_working(m), 'performance observer is working') + + # Performance observer should work if `privacy.resistFingerprinting = false` + with self.marionette.using_prefs({"privacy.resistFingerprinting": False}): + self.assertTrue(is_perf_obs_working(m), 'performance observer is not working')

1 0

[tor-browser-bundle-testsuite/master] Fix download_pdf test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit b44d95b16beb891ae730cb24fc29b0edb1324701 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun May 17 19:42:48 2020 +0200 Fix download_pdf test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_download_pdf.py | 38 +++++------------------ 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index ce5ffeb..a054438 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -485,8 +485,6 @@ our @tests = ( type => 'marionette', descr => 'Check if download of PDF is working (#19402)', use_net => 1, - # Bug 30333: temporarily disable test - enable => sub { undef }, }, { name => 'pinning_now', diff --git a/marionette/tor_browser_tests/test_download_pdf.py b/marionette/tor_browser_tests/test_download_pdf.py index 737a725..408f63a 100644 --- a/marionette/tor_browser_tests/test_download_pdf.py +++ b/marionette/tor_browser_tests/test_download_pdf.py @@ -1,6 +1,3 @@ -from marionette_driver import By, Actions -from marionette_driver.errors import MarionetteException, JavascriptException - from marionette_harness import MarionetteTestCase import testsuite @@ -19,31 +16,10 @@ class Test(MarionetteTestCase): def test_download_pdf(self): m = self.marionette - - m.set_search_timeout(1000) - m.set_window_size(1024, 300) - - with m.using_context('content'): - - current_window = m.current_chrome_window_handle - - m.navigate(self.URL) - download_button = m.find_element('id', 'download') - action = Actions(m) - action.click(download_button) - action.wait(time=3) - action.perform() - - closed_window = 0 - with m.using_context('chrome'): - for window in m.chrome_window_handles: - if window != current_window: - m.switch_to_window(window) - info_msg = m.find_element('id', 'info.body') - self.assertRegexpMatches(info_msg.text, 'Tails', - msg='Pop up window text does not include Tails') - m.close() - closed_window += 1 - m.switch_to_window(current_window) - self.assertEqual(closed_window, 1, msg="no download pop up") - + m.set_window_rect(width=1024, height=300) + m.navigate(self.URL) + download_button = m.find_element('id', 'download').click() + self.assertEqual(len(m.chrome_window_handles), 2, msg="Number of windows not correct") + dialog = m.switch_to_alert() + self.assertRegexpMatches(dialog.text, 'Tails', + msg='Pop up window text does not include Tails')

1 0

[tor-browser-bundle-testsuite/master] Fix fp_navigator and fp_useragent tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 376bbd63eff6a16e4b6c810ba0594d3efe529470 Author: Alex Catarineu <acat(a)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"))

1 0

[tor-browser-bundle-testsuite/master] Fix user-timing-worker test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit e102b9b86988121fc1c14ca2a05bfb9a2ca1dae4 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun May 17 20:21:40 2020 +0200 Fix user-timing-worker test --- marionette/tor_browser_tests/test_page.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/marionette/tor_browser_tests/test_page.py b/marionette/tor_browser_tests/test_page.py index bc1eb69..d03367c 100644 --- a/marionette/tor_browser_tests/test_page.py +++ b/marionette/tor_browser_tests/test_page.py @@ -1,6 +1,3 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase import testsuite @@ -28,7 +25,7 @@ class Test(MarionetteTestCase): def test_page(self): with self.marionette.using_context('content'): self.marionette.navigate(self.test_page_url) - self.marionette.set_search_timeout(self.timeout) + self.marionette.timeout.implicit = self.timeout/1000 elt = self.marionette.find_element('id', 'test_result'); self.assertEqual(elt.text, 'OK')

1 0

[tor-browser-bundle-testsuite/master] Fix readelf_RELRO, readelf_stack_canary and readelf_PIE
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit cd6aa441e887e0a587e572e6e901219fbca14f69 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun May 17 20:36:53 2020 +0200 Fix readelf_RELRO, readelf_stack_canary and readelf_PIE --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index a054438..e92fe6d 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -99,6 +99,8 @@ our @tests = ( TorBrowser/Tor/PluggableTransports/meek-client-torbrowser TorBrowser/Tor/PluggableTransports/obfs4proxy TorBrowser/Tor/PluggableTransports/zope/interface/_zope_interface_coptimizations.so + TorBrowser/Tor/PluggableTransports/snowflake-client + TorBrowser/ncprop279/ncprop279 ) ], }, { @@ -106,7 +108,7 @@ our @tests = ( type => 'command', descr => 'Check for stack canary support', files => \&tbb_binfiles, - command => [ 'readelf', '-s' ], + command => [ 'readelf', '-s', '--wide' ], check_output => sub { $_[0] =~ m/__stack_chk_fail/ }, enable => sub { $OSNAME eq 'linux' }, # ticket 13056 @@ -115,7 +117,6 @@ our @tests = ( gtk2/libmozgtk.so libmozalloc.so libmozgtk.so - libnssckbi.so libplc4.so libplds4.so TorBrowser/Tor/libstdc++/libstdc++.so.6 @@ -130,6 +131,11 @@ our @tests = ( TorBrowser/Tor/PluggableTransports/zope/interface/_zope_interface_coptimizations.so TorBrowser/Tor/PluggableTransports/meek-client TorBrowser/Tor/PluggableTransports/obfs4proxy + TorBrowser/Tor/PluggableTransports/snowflake-client + TorBrowser/ncprop279/ncprop279 + libgraphitewasm.so + liboggwasm.so + libmozwayland.so ) ], }, { @@ -154,6 +160,7 @@ our @tests = ( TorBrowser/Tor/PluggableTransports/meek-client-torbrowser TorBrowser/Tor/PluggableTransports/obfs4proxy TorBrowser/Tor/PluggableTransports/snowflake-client + TorBrowser/ncprop279/ncprop279 ) ], }, {

1 0

[tor-browser-bundle-testsuite/master] Fix readelf_no_rpath test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit a05667015ccd4811a3b4901d8bcc97eb455773b7 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 15:52:27 2020 +0200 Fix readelf_no_rpath test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 90d445c..b7014f4 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -180,6 +180,9 @@ our @tests = ( command => [ 'readelf', '-d' ], check_output => sub { ! ( $_[0] =~ m/runpath/ ) }, enable => sub { $OSNAME eq 'linux' }, + skip_files => [ qw( + updater + ) ], # We have tor-browser-build#40092 for investigating this }, { name => 'otool_PIE',

1 0

[tor-browser-bundle-testsuite/master] Fix searchengines test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit aa420c446bacd1dd800ad75467261726037b5ec2 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 09:36:03 2020 +0200 Fix searchengines test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_searchengines.py | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 0bf4359..91aa6f0 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -385,8 +385,6 @@ our @tests = ( name => 'searchengines', type => 'marionette', descr => 'Check that we have the default search engines set', - # Bug 30340: temporarily disable test - enable => sub { undef }, }, { name => 'noscript', diff --git a/marionette/tor_browser_tests/test_searchengines.py b/marionette/tor_browser_tests/test_searchengines.py index 69d0ffe..eeb2c6b 100644 --- a/marionette/tor_browser_tests/test_searchengines.py +++ b/marionette/tor_browser_tests/test_searchengines.py @@ -22,12 +22,15 @@ class Test(MarionetteTestCase): def test_searchengines(self): with self.marionette.using_context('content'): - self.marionette.navigate('about:') + self.marionette.navigate('about:robots') with self.marionette.using_context('chrome'): - searchbar = self.marionette.find_element('id', 'searchbar') - txtbox = searchbar.find_element('anon attribute', {'anonid': 'searchbar-textbox'}) - self.assertRegexpMatches(txtbox.get_attribute('label'), 'DuckDuckGo', - 'DuckDuckGo is not the default search engine!') + self.marionette.timeout.implicit = 5 + searchbar = self.marionette.find_element('id', 'urlbar-input') + searchbar.click() + searchbar.send_keys("test") + urlbarresults = self.marionette.find_element('id', 'urlbar-results') + result = urlbarresults.find_element("css selector", "div:first-child .urlbarView-action") + self.assertRegexpMatches(result.text, 'DuckDuckGo', 'DuckDuckGo is not the default search engine!') #XXX: Test whether the second and third engine are the ones we want as well.

1 0

[tor-browser-bundle-testsuite/master] Fix play_videos test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit e8a5a6b29969e9b68a2d4acc989508b6a5ee748f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 10:26:07 2020 +0200 Fix play_videos test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 4 +--- marionette/tor_browser_tests/test_page.py | 5 +++-- test-data/play_videos.html | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 4223132..365b7bc 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -428,10 +428,8 @@ our @tests = ( descr => 'Play some videos', use_net => 1, marionette_test => 'page', - remote => 1, + remote => 0, timeout => 50000, - # Bug 30339: temporarily disable test - enable => sub { undef }, }, { name => 'svg-disable', diff --git a/marionette/tor_browser_tests/test_page.py b/marionette/tor_browser_tests/test_page.py index d03367c..3d1f4cc 100644 --- a/marionette/tor_browser_tests/test_page.py +++ b/marionette/tor_browser_tests/test_page.py @@ -13,9 +13,10 @@ class Test(MarionetteTestCase): if ts.t['test']['remote']: test_data_url = ts.t['options']['test_data_url'] + self.test_page_url = '%s/%s.html' % (test_data_url, ts.t['test']['name']) else: - test_data_url = "file://%s" % ts.t['options']['test_data_dir'] - self.test_page_url = '%s/%s.html' % (test_data_url, ts.t['test']['name']) + self.test_page_url = self.marionette.absolute_url('%s.html' % (ts.t['test']['name'])) + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) if ts.t['test']['timeout']: self.timeout = ts.t['test']['timeout'] diff --git a/test-data/play_videos.html b/test-data/play_videos.html index 76e4d1f..a2f4112 100644 --- a/test-data/play_videos.html +++ b/test-data/play_videos.html @@ -34,7 +34,8 @@ for (var i = 0; i < videos.length; i++) { next[v.id] = 'videos_' + (i + 1).toString(); document.getElementById("videos").appendChild(v); } -document.getElementById("videos_0").play(); +const first = document.getElementById("videos_0"); +first.addEventListener("canplay", () => first.play()); </script> </body>

1 0