1172497 - GaiaTest should not touch lockscreen when it's disabled

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::UI Tests, defect)

Description

[Frederik Braun [:freddy]]

Attachment: stdout when running gaiatest

In a Gaia profile with NO_LOCK_SCREEN=1 I get the errors about ScreenManager not being defined (see attachment).

This is likely caused by gaia_test.py line ~864

>        # Make sure the screen isn't turned off in lockscreen mode
>        self.marionette.switch_to_frame()
>        self.marionette.execute_script(
>            'window.wrappedJSObject.ScreenManager.LOCKING_TIMEOUT = 9999;')



Dave Hunt suggested guarding that call and only execute if lockscreen is enabled.

Comment 1

[Martijn Wargers (dead)]

(In reply to Frederik Braun [:freddyb] from comment #0)
> Dave Hunt suggested guarding that call and only execute if lockscreen is
> enabled.

The problem with that is that once the lockscreen is enabled, it uses the LOCKING_TIMEOUT value of that that time when it is engaged. It won't use the new LOCKING_TIMEOUT value.

Comment 2

[Martijn Wargers (dead)]

(In reply to Frederik Braun [:freddyb] from comment #0)
> Dave Hunt suggested guarding that call and only execute if lockscreen is
> enabled.

Ah, I guess Dave Hunt meant the lockscreen.enabled setting. Yes, I can do that.

Comment 3

[Martijn Wargers (dead)]

Fwiw, I was running a gaiatest with NO_LOCK_SCREEN=1 and I couldn't reproduce this problem.

Comment 4

[Martijn Wargers (dead)]

Attachment: https://github.com/mozilla-b2g/gaia/pull/30486

I wasn't able to reproduce this. Frederik, does this solve the issue?
I think this change is good, because every test that needs lockscreen, does use self.device.lock() for it.

Comment 5

[Frederik Braun [:freddy]]

Comment on attachment 8616727 [details] [review]
https://github.com/mozilla-b2g/gaia/pull/30486

Yes, that would work for me.

Comment 6

[Martijn Wargers (dead)]

Merged: https://github.com/mozilla-b2g/gaia/commit/e6106a94ad92b54aa6dfad8892b0a556b78b01da