1281427 - Move all the browser_devices* tests to browser/base/content/test/webrtc

Status: RESOLVED FIXED

(Firefox :: Site Permissions, defect)

Description

[Florian Quèze [:florian]]

We already have a couple browser_devices* tests and I expect a few more to come. I think it's time to move them to their own folder, e.g. browser/base/content/test/webrtc

Comment 1

[Florian Quèze [:florian]]

Attachment: part 1 - move browser_devices_* tests to a webrtc folder

Comment 2

[Florian Quèze [:florian]]

Attachment: part 2 - merge get_user_media_helpers.js into head.js

Comment 3

[Florian Quèze [:florian]]

Attachment: part 3 - Cleanup

Comment 4

[Florian Quèze [:florian]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=146e3b3e5175

Comment 5

[:Gijs (he/him)]

Comment on attachment 8764638 [details] [diff] [review]
part 2 - merge get_user_media_helpers.js into head.js

Review of attachment 8764638 [details] [diff] [review]:
-----------------------------------------------------------------

rs=me on the assumption that the content added to head.js is essentially identical (haven't checked, but you told me it essentially is).

Comment 6

[:Gijs (he/him)]

Comment on attachment 8764636 [details] [diff] [review]
part 1 - move browser_devices_* tests to a webrtc folder

Review of attachment 8764636 [details] [diff] [review]:
-----------------------------------------------------------------

::: browser/base/content/test/webrtc/head.js
@@ +1,4 @@
> +Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
> +
> +XPCOMUtils.defineLazyModuleGetter(this, "Promise",
> +  "resource://gre/modules/Promise.jsm");

Can we do a followup patch where we nuke this from orbit...

@@ +2,5 @@
> +
> +XPCOMUtils.defineLazyModuleGetter(this, "Promise",
> +  "resource://gre/modules/Promise.jsm");
> +
> +function waitForCondition(condition, nextTest, errorMsg, retryTimes) {

and replace this with the BrowserTestUtils equivalent

@@ +25,5 @@
> +  }, 100);
> +  var moveOn = function() { clearInterval(interval); nextTest(); };
> +}
> +
> +function promiseWaitForCondition(aConditionFn) {

getting rid of this as well.

Comment 7

[:Gijs (he/him)]

Comment on attachment 8764639 [details] [diff] [review]
part 3 - Cleanup

Review of attachment 8764639 [details] [diff] [review]:
-----------------------------------------------------------------

rs=me but please note the license notes.

::: browser/base/content/test/webrtc/browser_devices_get_user_media_in_frame.js
@@ -1,3 @@
> -/* This Source Code Form is subject to the terms of the Mozilla Public
> - * License, v. 2.0. If a copy of the MPL was not distributed with this
> - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

Err, do we know that we can do this license change, ie are all the contributors to this file moco employees?

::: browser/base/content/test/webrtc/head.js
@@ +1,2 @@
> +/* Any copyright is dedicated to the Public Domain.
> +   http://creativecommons.org/publicdomain/zero/1.0/ */

Don't need a license in test files.

Comment 8

[Florian Quèze [:florian]]

(In reply to :Gijs Kruitbosch from comment #7)

> browser/base/content/test/webrtc/browser_devices_get_user_media_in_frame.js
> @@ -1,3 @@
> > -/* This Source Code Form is subject to the terms of the Mozilla Public
> > - * License, v. 2.0. If a copy of the MPL was not distributed with this
> > - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
> 
> Err, do we know that we can do this license change, ie are all the
> contributors to this file moco employees?

For actual code contributions (ie. writing code), yes all contributors are moco employees. For tree-wide search & replace changes, it's less clear.

Comment 9

[Florian Quèze [:florian]]

https://hg.mozilla.org/integration/fx-team/rev/587632fc8560f2fc8fb81097eb1fa291609b0bae
Bug 1281427 - move browser_devices_* tests to a webrtc folder, r=Gijs.

https://hg.mozilla.org/integration/fx-team/rev/c2df79b7e04db32eff4fe14d0c91b46c67ef4684
Bug 1281427 - merge get_user_media_helpers.js into head.js, r=Gijs.

https://hg.mozilla.org/integration/fx-team/rev/7cf93d6c932bf2a643beb2ea304c3d57cfc95f3a
Bug 1281427 - Cleanup calls to SpecialPowers.push/popPrefEnv, r=Gijs.

Comment 10

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/587632fc8560
https://hg.mozilla.org/mozilla-central/rev/c2df79b7e04d
https://hg.mozilla.org/mozilla-central/rev/7cf93d6c932b