1162836 - Fix NFC marionette testcase fail

Status: RESOLVED FIXED

(Firefox OS Graveyard :: NFC, defect)

Description

[Dimi Lee [:dimi]]

We have done a lots of refactoring on NFC but we didn't update testcase accordingly.
This bug is used to fix those testcases fail.

Comment 1

[Dimi Lee [:dimi]]

Attachment: Patch v1

Comment 2

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Comment on attachment 8605699 [details] [diff] [review]
Patch v1

Review of attachment 8605699 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/nfc/tests/marionette/head.js
@@ +200,5 @@
>  
> +  // In bug 1109592, nfcd will only run when nfc is enabled
> +  // The way we activate/deactivate nfcd is by using set property "ctl.start" & "ctl.stop"
> +  // In emulator it seems sometimes enable/disable NFC too quick will cause nfcd won't start
> +  // So here is just a simple workaround too delay enable or disable

file a bug

::: dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js
@@ +50,5 @@
>  function testWithSessionTokenWithTarget() {
>    log('testWithSessionTokenWithTarget');
>    toggleNFC(true)
> +  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0, false))
> +  .then(waitTechDiscovered)

waitForTechDiscovered

@@ +71,5 @@
>    log('testWithSessionTokenNoTarget');
>    toggleNFC(true)
> +  .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0, false))
> +  .then(waitTechDiscovered)
> +  .then(() => nfc.checkP2PRegistration(FAKE_MANIFEST_URL))

should use MANIFEST_URL, as the original code does

::: dom/nfc/tests/marionette/test_nfc_error_messages.js
@@ +138,5 @@
>    NCI.deactivate();
>    return deferred.promise;
>  }
>  
> +function waitTechDiscovered() {

move this to head.js ?

Comment 3

[Dimi Lee [:dimi]]

Attachment: Patch v2

Address yoshi's comment

Comment 4

[Dimi Lee [:dimi]]

Attachment: Patch v3

I have update testcases as discussed that tech lost will be triggered by testcase itself

Comment 5

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Comment on attachment 8607428 [details] [diff] [review]
Patch v3

Review of attachment 8607428 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/nfc/tests/marionette/test_nfc_read_tag.js
@@ +15,5 @@
>    let payload = url;
>  
>    sysMsgHelper.waitForTechDiscovered(function(msg) {
>      log("Received \'nfc-manager-tech-ndiscovered\'");
> +    ok(msg.peer === undefined, "check for correct message type");

the message needs to be updated

Comment 6

[Dimi Lee [:dimi]]

Attachment: Patch v4

Address yoshi's comment

Comment 7

[Dimi Lee [:dimi]]

This patch only update marionette-webapi test,
try result:
https://treeherder.allizom.org/#/jobs?repo=try&revision=b00b4fb24cab

Comment 8

[Pulsebot]

https://hg.mozilla.org/integration/b2g-inbound/rev/1f529b19f295

Comment 9

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

https://hg.mozilla.org/mozilla-central/rev/1f529b19f295