Right now FirefoxTestCase is in firefox_ui_harness/testcases/base.py. We want it to be in firefox_puppeteer/testcase.py instead. Why: we will be moving parts of firefox_ui_harness into the Marionette test runner in mozilla-central and moving firefox_puppeteer into mozilla-central (bug 1212608, bug 1212609); however, we don't want Marionette test runner to depend on firefox_puppeteer.

Similarly, firefox_ui_harness/testcases/update.py should be moved to firefox_ui_tests/testcases/update.py

Maja Frydrychowicz, FirefoxTestCase and UpdateTestCase, both have been moved to firefox_puppeteer

Thanks, ujjwal. This looks good, but I think you missed Comment #1 above. UpdateTestCase should not be in firefox_puppeteer; please update your PR accordingly.

Maja Frydrychowicz, Sorry, I missed that. I have updated the code.

Comment on attachment 8677082 [details] Move FirefoxTestCase from firefox_ui_harness into firefox_puppeteer Thanks, ujjwal. Looks good.

Comment on attachment 8677082 [details] Move FirefoxTestCase from firefox_ui_harness into firefox_puppeteer Looks perfect now! Thank you a lot for this patch. I will get it landed shortly.

Merged the PR to mozilla-central: https://github.com/mozilla/firefox-ui-tests/commit/50527c612f3c063ab52046d0d01f610b64f5f003 Maja, do you think we should backport that patch and following ones to older branches? If we don't do that it might get harder to backport important changes due to that tests will diverge more and more. Personally I would do it - all should apply cleanly.

Good point. Yes, let's backport.

After backporting a couple of other patches to the older branches I can finally backport this patch now to beta and release. I will not fix it on esr38 which is too complicated to do due to all the merge conflicts. If we have troubles on that branch with newer releases of Marionette, we have to stick it to an older version. https://github.com/mozilla/firefox-ui-tests/commit/5cf7b0b8d289a5caad063466da7716a5a0a5ed3c (beta) https://github.com/mozilla/firefox-ui-tests/commit/afea285b93a54cfc1d431c6d6ec0d86f21b764e2 (release)