1142212 - skip_if_b2g missing from marionette package

Status: RESOLVED FIXED

(Testing :: Marionette Client and Harness, defect)

Description

[Andreas Tolfsen ❲:ato❳]

The skip_if_b2g symbol is missing from the new marionette Python package.  This makes importing it slightly ugly:

    from marionette.marionette_test import skip_if_b2g

Instead it would be better if we could do:

    from marionette import skip_if_b2g

Like you can do with MarionetteTestCase:

    from marionette import MarionetteTestCase

Comment 1

[ck]

I would like to work on it as my first bug on mozilla.

Comment 2

[Andreas Tolfsen ❲:ato❳]

(In reply to ck from comment #1)
> I would like to work on it as my first bug on mozilla.

Excellent, assigning it to you!  I'm ato on #ateam on irc.mozilla.org if you need any guidance.

Comment 3

[Louie Lu]

Hello, I would like to fix this problem. Can you assign me on this?
thanks!

Comment 4

[Louie Lu]

Attachment: 1142212.patch

Comment 5

[Andreas Tolfsen ❲:ato❳]

The attached patch file seems to be empty?

Comment 6

[Louie Lu]

Attachment: 1142212.patch

fixed nothing inside.

Comment 7

[Ryan VanderMeulen [:RyanVM]]

Sorry Louie, but this patch doesn't apply cleanly. Please rebase it on top of mozilla-central and re-request checkin. Sorry for the inconvenience!

Comment 8

[Louie Lu]

Attachment: 1142212.patch

RyanVM: I'm not sure about what mean "not rebase to top", is that I didn't hg pull and update the code?

I saw that after pull and update, marionette version change to 0.19. 

thanks.

Comment 9

[Louie Lu]

Comment on attachment 8655773 [details] [diff] [review]
1142212.patch

># HG changeset patch
># User Louie Lu <[e-mail]>
># Parent  fb720c90eb49590ba55bf52a8a4826ffff9f528b
>Bug 1142212 - Fixed marionette import skip_if_b2g problem. r=ato
>
>diff --git a/testing/marionette/client/marionette/__init__.py b/testing/marionette/client/marionette/__init__.py
>--- a/testing/marionette/client/marionette/__init__.py
>+++ b/testing/marionette/client/marionette/__init__.py
>@@ -1,28 +1,29 @@
> # 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/.
> 
> 
> __version__ = '0.19'
> 
>-from .marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
>+from .marionette_test import MarionetteTestCase, MarionetteJSTestCase, \
>+    CommonTestCase, expectedFailure, skip, skip_if_b2g, SkipTest
> from .runner import (
>-        B2GTestCaseMixin,
>-        B2GTestResultMixin,
>-        BaseMarionetteArguments,
>-        BaseMarionetteTestRunner,
>-        BrowserMobProxyTestCaseMixin,
>-        EnduranceArguments,
>-        EnduranceTestCaseMixin,
>-        HTMLReportingArguments,
>-        HTMLReportingTestResultMixin,
>-        HTMLReportingTestRunnerMixin,
>-        Marionette,
>-        MarionetteTest,
>-        MarionetteTestResult,
>-        MarionetteTextTestRunner,
>-        MemoryEnduranceTestCaseMixin,
>-        TestManifest,
>-        TestResult,
>-        TestResultCollection
>+    B2GTestCaseMixin,
>+    B2GTestResultMixin,
>+    BaseMarionetteArguments,
>+    BaseMarionetteTestRunner,
>+    BrowserMobProxyTestCaseMixin,
>+    EnduranceArguments,
>+    EnduranceTestCaseMixin,
>+    HTMLReportingArguments,
>+    HTMLReportingTestResultMixin,
>+    HTMLReportingTestRunnerMixin,
>+    Marionette,
>+    MarionetteTest,
>+    MarionetteTestResult,
>+    MarionetteTextTestRunner,
>+    MemoryEnduranceTestCaseMixin,
>+    TestManifest,
>+    TestResult,
>+    TestResultCollection
> )

Comment 10

[Andreas Tolfsen ❲:ato❳]

It means there have been changes to the code you’ve changed since you wrote your path.  You need to pull the latest code from central and then rebase your local patch on top of that.

Unfortunately I don’t know how to do this without Mercurial bookmarks.

Comment 11

[Andreas Tolfsen ❲:ato❳]

Comment on attachment 8655773 [details] [diff] [review]
1142212.patch

Still looks good to me.

Comment 12

[sv]

Attachment: Description of the change

Comment 13

[sv]

Comment on attachment 8723180 [details] [diff] [review]
Description of the change

Sorry, the patch doesn't work. Will upload a new patch soon.

Comment 14

[Maja Frydrychowicz :impossibus (was :maja_zf) (needinfo me)]

Sounds good. I suggest you use MozReview to submit your patch: http://mozilla-version-control-tools.readthedocs.org/en/latest/mozreview-user.html#mozreview-user -- if you run into any issues feel free to ask for help on #ateam.

Comment 15

[sv]

Attachment: Description of the change

Comment 16

[Decky Coss (:deckycoss)]

i can work on this

Comment 17

[Maja Frydrychowicz :impossibus (was :maja_zf) (needinfo me)]

We haven't heard from sv in two weeks, so I'm assigning it to Decky for an Outreachy application.

Decky, please be sure to use Mozreview for patch submission - http://mozilla-version-control-tools.readthedocs.org/en/latest/mozreview/install.html#configuring-your-machine-to-use-mozreview

Questions always welcome. :)

Comment 18

[Decky Coss (:deckycoss)]

Attachment: MozReview Request: Bug 1142212 - import skip_if_b2g from marionette instead of marionette.marionette_test; r?maja_zf

Review commit: https://reviewboard.mozilla.org/r/39533/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/39533/

Comment 19

[Maja Frydrychowicz :impossibus (was :maja_zf) (needinfo me)]

Comment on attachment 8729638 [details]
MozReview Request: Bug 1142212 - import skip_if_b2g from marionette instead of marionette.marionette_test; r?maja_zf

https://reviewboard.mozilla.org/r/39533/#review36195

Thanks for the patch. To complete it, could you also change import statements to take advantage of your change in `__init__.py`? 

e.g. `marionette.marionette_test import skip_if_b2g` should be `from marionette import skip_if_b2g`

I would just grep in testing/marionette directory to find all occurances.

Comment 20

[Decky Coss (:deckycoss)]

Comment on attachment 8729638 [details]
MozReview Request: Bug 1142212 - import skip_if_b2g from marionette instead of marionette.marionette_test; r?maja_zf

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/39533/diff/1-2/

Comment 21

[Maja Frydrychowicz :impossibus (was :maja_zf) (needinfo me)]

Comment on attachment 8729638 [details]
MozReview Request: Bug 1142212 - import skip_if_b2g from marionette instead of marionette.marionette_test; r?maja_zf

https://reviewboard.mozilla.org/r/39533/#review36615

Thanks for the patch!

Comment 22

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5bac73523d33

Comment 23

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

https://hg.mozilla.org/mozilla-central/rev/5bac73523d33

Comment 24

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

Moving bugs for Marionette client due to component changes.