1061717 - Missing changes from merges on lower branches

Status: RESOLVED FIXED

(Mozilla QA Graveyard :: Mozmill Tests, defect)

Description

[Andrei Eftimie]

As discussed in bug 1056477 we have some omissions from mercurial when doing merges with conflicts. The conflicted changes sometimes won't get propagated and we end up with unexpected results in our code.

I've checked all branches (except ESR24) and the following are the changes that we need to do to be in sync (there are a few others, but those are minor: some comments / spaces):

mozilla-esr31
=============
1) > testAboutCache.js
only exists on mozilla-esr31 branch. It was removed from all
other branches (see bug 888924). Should this be removed from esr31 as well?

mozilla-release
===============
2) Bug 992187
The following tests should not be disabled on mozilla-release
> firefox/tests/remote/restartTests/testAddons_InstallAddonWithoutEULA/test1.js
> firefox/tests/remote/restartTests/testAddons_InstallAddonWithoutEULA/test2.js

mozilla-beta
============
3) Bug 905963
> functional/testPrivateBrowsing/testOpenClosePBKeyboardShortcut.js
The test is still disabled on mozilla-beta, mozilla-release and mozilla-esr31.
It should have been unskipped as per bug 905963.

mozilla-aurora
==============
4)  
> data/addons/blocklist/softblock_extension/blocklist.xml
The correct file version lives in default. This was poorly merged back in 2012:
http://hg.mozilla.org/qa/mozmill-tests/rev/63bdef26047a
And now contains a duplicate entry.


We will probably need multiple patches to fix all these, as they will only need to land on certain branches.

I will update the merge documentation to include a new step which will check that the merge is thorough.

Comment 1

[Henrik Skupin [:whimboo][⌚️UTC+2]]

(In reply to Andrei Eftimie from comment #0)
> 1) > testAboutCache.js
> only exists on mozilla-esr31 branch. It was removed from all
> other branches (see bug 888924). Should this be removed from esr31 as well?

Please see bug 888924 comment 18 ff.

> mozilla-release
> ===============
> 2) Bug 992187
> The following tests should not be disabled on mozilla-release
> > firefox/tests/remote/restartTests/testAddons_InstallAddonWithoutEULA/test1.js
> > firefox/tests/remote/restartTests/testAddons_InstallAddonWithoutEULA/test2.js

Correct.

> mozilla-beta
> ============
> 3) Bug 905963
> > functional/testPrivateBrowsing/testOpenClosePBKeyboardShortcut.js
> The test is still disabled on mozilla-beta, mozilla-release and
> mozilla-esr31.
> It should have been unskipped as per bug 905963.

Correct.

> mozilla-aurora
> ==============
> 4)  
> > data/addons/blocklist/softblock_extension/blocklist.xml
> The correct file version lives in default. This was poorly merged back in
> 2012:
> http://hg.mozilla.org/qa/mozmill-tests/rev/63bdef26047a
> And now contains a duplicate entry.

Good catch.  Lets get this also fixed.

> We will probably need multiple patches to fix all these, as they will only
> need to land on certain branches.

Right. Lets try to get this done soon to reflect the reality.

> I will update the merge documentation to include a new step which will check
> that the merge is thorough.

Thanks.

Comment 2

[Andrei Eftimie]

This has been partially fixed by the recent merge (in bug 1078137).
Only partially because any missing changes between branches will ride the trains from now on.

Going to close this bug, everything will be up-to-date after the next 2 merges. We have a new step in place in the merge procedure so this shouldn't happen again.

Right now both 2), 3) and 4) have been fixed with the merge.

The test from 1) is still on the ES31 branch. It doesn't harm, so we might as well leave it in.