Update mozmill tests to use MPL2 license block

RESOLVED FIXED

Status

Mozilla QA
Mozmill Tests
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: ashughes, Assigned: AlexLakatos)

Tracking

unspecified

Firefox Tracking Flags

(firefox14 fixed, firefox15 fixed, firefox16 fixed, firefox17 fixed, firefox-esr10 fixed)

Details

(Whiteboard: [mozmill-refactor][qa-], URL)

Attachments

(5 attachments, 3 obsolete attachments)

The following is a tracking bug for updating all Mozmill tests to use the MPL2 license block, as follows.

Replace this...
>/* ***** BEGIN LICENSE BLOCK *****
> * Version: MPL 1.1/GPL 2.0/LGPL 2.1
> *
> * The contents of this file are subject to the Mozilla Public License Version
> * 1.1 (the "License"); you may not use this file except in compliance with
> * the License. You may obtain a copy of the License at
> * http://www.mozilla.org/MPL/
> *
> * Software distributed under the License is distributed on an "AS IS" basis,
> * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
> * for the specific language governing rights and limitations under the
> * License.
> *
> * The Original Code is MozMill Test code.
> *
> * The Initial Developer of the Original Code is the Mozilla Foundation.
> * Portions created by the Initial Developer are Copyright (C) 2011
> * the Initial Developer. All Rights Reserved.
> *
> * Contributor(s):
> *   name <email> (original author)
> *
> * Alternatively, the contents of this file may be used under the terms of
> * either the GNU General Public License Version 2 or later (the "GPL"), or
> * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
> * in which case the provisions of the GPL or the LGPL are applicable instead
> * of those above. If you wish to allow use of your version of this file only
> * under the terms of either the GPL or the LGPL, and not to allow others to
> * use your version of this file under the terms of the MPL, indicate your
> * decision by deleting the provisions above and replace them with the notice
> * and other provisions required by the GPL or the LGPL. If you do not delete
> * the provisions above, a recipient may use your version of this file under
> * the terms of any one of the MPL, the GPL or the LGPL.
> *
> * ***** END LICENSE BLOCK ***** */

With this...
> /* 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/.
> */

This applies to everything in the tests, lib, and templates folders.
This applies to default, mozilla-aurora, mozilla-beta, mozilla-release, and mozilla-esr10 branches.
Pausing here for feedback before we proceed with implementation.

Do we want to split this work into multiple bugs?
Do we have any concerns with the license block?
(In reply to Anthony Hughes, Mozilla QA (irc: ashughes) from comment #1)

> Do we want to split this work into multiple bugs?
My personal opinion is that we do everything in this bug but handle it in multiple patches (one for tests, one for lib, one for templates).

> Do we have any concerns with the license block?
My personal opinion is that the new license block is a drastic improvement over the old one.
(In reply to Anthony Hughes, Mozilla QA (irc: ashughes) from comment #2)
> > Do we want to split this work into multiple bugs?
> My personal opinion is that we do everything in this bug but handle it in
> multiple patches (one for tests, one for lib, one for templates).

Why? I don't understand. Gerv has a script which is doing that automatically. So I'm not sure why people have to create patches for it manually.

> > Do we have any concerns with the license block?
> My personal opinion is that the new license block is a drastic improvement
> over the old one.

Something I would like to see addressed before is an AUTHORS file. It should contain all the contributors to the mozmill-tests repository.
I have a script for doing this, and any file with an existing license block will be converted in bug 716478, which covers all of mozilla-central and comm-central.

If you do make a change, can you please use the boilerplate formatted exactly as here:
http://www.mozilla.org/MPL/headers/
and not the one in comment 0?

Gerv
(Assignee)

Comment 5

5 years ago
Created attachment 608679 [details] [diff] [review]
patch v1.0

Ran the script on all folders, except the addons tests.
Assignee: nobody → alex.lakatos
Status: NEW → ASSIGNED
Attachment #608679 - Flags: review?(anthony.s.hughes)
Comment on attachment 608679 [details] [diff] [review]
patch v1.0

Patch is good except that the script missed some of the files. Please update your patch to include the following files (you'll need to do this manually):

 * lib/software-update.js
 * tests/functional/testAwesomeBar/testAccessLocationBar.js
 * tests/functional/testAwesomeBar/testLocationBarSearches.js
 * tests/functional/testAwesomeBar/testPasteLocationBar.js
 * tests/functional/testPopups/testPopupsBlocked.js
 * tests/functional/testSecurity/testEncryptedPageWarning.js
 * tests/functional/testSecurity/testSafeBrowsingNotificationBar.js
 * tests/functional/testSecurity/testSafeBrowsingWarningPages.js
 * tests/functional/testSecurity/testSubmitUnencryptedInfoWarning.js
Attachment #608679 - Flags: review?(anthony.s.hughes) → review-
NOTE: We should follow this up with a patch to add a license block to the test data as per http://www.mozilla.org/MPL/headers/ but I think we take care of that on a separate bug.
(Assignee)

Comment 8

5 years ago
Created attachment 609339 [details] [diff] [review]
patch v2.0

Manually edited the missing files.
Attachment #608679 - Attachment is obsolete: true
Attachment #609339 - Flags: review?(anthony.s.hughes)
Comment on attachment 609339 [details] [diff] [review]
patch v2.0

Looks good, thanks Alex.
Attachment #609339 - Flags: review?(anthony.s.hughes) → review+
Comment on attachment 609339 [details] [diff] [review]
patch v2.0

Sorry, changing to r-. Patch fails to apply for libs/places.js. Please update the patch.
Attachment #609339 - Flags: review+ → review-
(Assignee)

Comment 11

5 years ago
Created attachment 609703 [details] [diff] [review]
fix v2.1 (default) [landed]

This one applies cleanly
Attachment #609339 - Attachment is obsolete: true
Attachment #609703 - Flags: review?(anthony.s.hughes)
Comment on attachment 609703 [details] [diff] [review]
fix v2.1 (default) [landed]

Landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/ff2332f6f494 (default)
Attachment #609703 - Attachment description: patch v2.1 → fix v2.1 [landed:default]
Attachment #609703 - Flags: review?(anthony.s.hughes) → review+
Alex, please verify this does not cause any regressions with tomorrow's Nightly testrun. If not we can port this to the other branches.

Thanks
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
(Assignee)

Comment 14

5 years ago
Created attachment 610593 [details] [diff] [review]
fix v2.1 (aurora) [landed]

patch for the mozilla-aurora branch
(Assignee)

Updated

5 years ago
Attachment #610593 - Flags: review?(anthony.s.hughes)
(Assignee)

Comment 15

5 years ago
Created attachment 610596 [details] [diff] [review]
fix v2.1 (beta) [landed]

patch for the mozilla-beta branch
Attachment #610596 - Flags: review?(anthony.s.hughes)
(Assignee)

Comment 16

5 years ago
Created attachment 610597 [details] [diff] [review]
fix v2.1 (release) [landed]

patch for the mozilla-release branch
Attachment #610597 - Flags: review?(anthony.s.hughes)
Comment on attachment 610593 [details] [diff] [review]
fix v2.1 (aurora) [landed]

Landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/28b21a2b736b (mozilla-aurora)
Attachment #610593 - Attachment description: fixPatch v2.1[aurora] → fix v2.1 (aurora) [landed]
Attachment #610593 - Flags: review?(anthony.s.hughes) → review+
Attachment #609703 - Attachment description: fix v2.1 [landed:default] → fix v2.1 (aurora)
Attachment #609703 - Attachment description: fix v2.1 (aurora) → fix v2.1 (default) [landed]
Comment on attachment 610596 [details] [diff] [review]
fix v2.1 (beta) [landed]

Landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/c5e97b682a9e (mozilla-beta)
Attachment #610596 - Attachment description: fixPatch v2.1[beta] → fix v2.1 (beta) [landed]
Attachment #610596 - Flags: review?(anthony.s.hughes) → review+
Comment on attachment 610597 [details] [diff] [review]
fix v2.1 (release) [landed]

This patch seems to miss:
 * /tests/endurance/testAddons_OpenAndCloseExtensionList/test1.js
Attachment #610597 - Flags: review?(anthony.s.hughes) → review-
Additionally, please prepare patches for 1.9.2 and esr10.
(Assignee)

Comment 21

5 years ago
(In reply to Anthony Hughes, Mozilla QA (irc: ashughes) from comment #19)
> Comment on attachment 610597 [details] [diff] [review]
> fixPatch v2.1[release]
> 
> This patch seems to miss:
>  * /tests/endurance/testAddons_OpenAndCloseExtensionList/test1.js
That's because the release branch does not have that test in it:
http://hg.mozilla.org/qa/mozmill-tests/file/mozilla-release/tests/endurance
(In reply to Alex Lakatos[:AlexLakatos] from comment #21)
> That's because the release branch does not have that test in it:
> http://hg.mozilla.org/qa/mozmill-tests/file/mozilla-release/tests/endurance

Ah yes, you are right. Thanks.
Attachment #610597 - Flags: review- → review+
Comment on attachment 610597 [details] [diff] [review]
fix v2.1 (release) [landed]

Landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/c5e97b682a9e (mozilla-release)
Attachment #610597 - Attachment description: fixPatch v2.1[release] → fix v2.1 (release) [landed]
Please provide a patch for esr10 and 1.9.2 -- thanks.
(In reply to Alex Lakatos[:AlexLakatos] from comment #21)
> > This patch seems to miss:
> >  * /tests/endurance/testAddons_OpenAndCloseExtensionList/test1.js
> That's because the release branch does not have that test in it:
> http://hg.mozilla.org/qa/mozmill-tests/file/mozilla-release/tests/endurance

Huh, why? What's the reason for? Did we miss it?
(In reply to Henrik Skupin (:whimboo) from comment #25)
> (In reply to Alex Lakatos[:AlexLakatos] from comment #21)
> > > This patch seems to miss:
> > >  * /tests/endurance/testAddons_OpenAndCloseExtensionList/test1.js
> > That's because the release branch does not have that test in it:
> > http://hg.mozilla.org/qa/mozmill-tests/file/mozilla-release/tests/endurance
> 
> Huh, why? What's the reason for? Did we miss it?

It seems we missed it. That test was suppose to land on all branches
So please make a comment in the appropriate bug. We should transplant it over.
You really don't have to do all the historic branches; the main Mozilla relicensing effort is only doing the trunk, and letting it "filter down" over time.

Gerv
(In reply to Henrik Skupin (:whimboo) from comment #27)
> So please make a comment in the appropriate bug. We should transplant it
> over.

I found out what happened. Bug 705118 covers the work for that test. It was landed on default on Jan 9th but Vlad failed to verify it was passing so it never got ported. Subsequently it was merged forward to aurora on Jan 31 and beta on Mar 16.

We can deal with this on bug 705118.
Let's backport this to ESR as it's causing us to create patches where the only difference is the license. Alex or Vlad, can you take this?
Status: RESOLVED → REOPENED
status-firefox-esr10: --- → affected
status-firefox14: --- → fixed
status-firefox15: --- → fixed
status-firefox16: --- → fixed
status-firefox17: --- → fixed
Resolution: FIXED → ---
(Assignee)

Comment 31

5 years ago
I'll take it, it was mine in the first place.
This is actually fixed but only needs a backport to esr10. Thanks Alex for taking it!
Status: REOPENED → RESOLVED
Last Resolved: 5 years ago5 years ago
Resolution: --- → FIXED
(Assignee)

Comment 33

5 years ago
Created attachment 645844 [details] [diff] [review]
fix v2.1 (esr)

fix for the esr branch
If you want to check the file names in the diff view of bugzilla, here is a livemark that collapses them for you:
>javascript:(function(){for(i=0;i<document.getElementsByTagName("a").length;%20i++){if(document.getElementsByTagName("a")[i].onclick!=null){evt=document.createEvent("MouseEvents");evt.initMouseEvent("click",%20true,%20true,%20window,%200,%200,%200,%200,%200,%20false,%20false,%20false,%20false,%200,%20null);document.getElementsByTagName("a")[i].dispatchEvent(evt);}}})()
Attachment #645844 - Flags: review?(hskupin)
Attachment #645844 - Flags: review?(dave.hunt)
(Assignee)

Comment 34

5 years ago
(In reply to Alex Lakatos[:AlexLakatos] from comment #33)
> If you want to check the file names in the diff view of bugzilla, here is a
> livemark that collapses them for you:
Ignore the fact there is a "Collapse All" link. Seems to be broken in my Nightly with my dirty profile, but just tried it on a clean one and it works.
Comment on attachment 645844 [details] [diff] [review]
fix v2.1 (esr)

A couple of files in lib were missed. Updated patch incoming.
Attachment #645844 - Flags: review?(hskupin)
Attachment #645844 - Flags: review?(dave.hunt)
Attachment #645844 - Flags: review-
Created attachment 645913 [details] [diff] [review]
fix v2.2 (esr)

$ grep -R "MPL 1.1" . --exclude=*.patch | wc -l
       0
Attachment #645844 - Attachment is obsolete: true

Updated

5 years ago
Attachment #645913 - Flags: review?(hskupin)
Comment on attachment 645913 [details] [diff] [review]
fix v2.2 (esr)

I trust your grep code, Dave! Good you caught that. Lets get it landed.
Attachment #645913 - Flags: review?(hskupin) → review+
Patch for esr10 landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/b69834b26946
status-firefox-esr10: affected → fixed
Whiteboard: [mozmill-refactor] → [mozmill-refactor][qa-]
You need to log in before you can comment on or make changes to this bug.