Bug 1696626 - Run ldap mochitests against JS implementation. r=darktrojan

Depends on D117143.

Differential Revision: https://phabricator.services.mozilla.com/D117144

Depends on D117143

ldap/modules/LDAPOperation.jsm

@@ -65,6 +65,7 @@ class LDAPOperation {
       limit,
       res => {
         if (res.constructor.name == "SearchResultDone") {
+          this._messageId = null;
           this._listener.onLDAPMessage({
             errorCode: res.result.resultCode,
             type: Ci.nsILDAPMessage.RES_SEARCH_RESULT,
@@ -88,7 +89,9 @@ class LDAPOperation {
   }
 
   abandonExt() {
-    this._client.abandon(this._messageId);
+    if (this._messageId) {
+      this._client.abandon(this._messageId);
+    }
   }
 }
 

mail/components/addrbook/moz.build

@@ -6,6 +6,8 @@
 JAR_MANIFESTS += ["jar.mn"]
 
 BROWSER_CHROME_MANIFESTS += [
+    "test/browser/browser-jsm.ini",
     "test/browser/browser.ini",
+    "test/browser/new/browser-jsm.ini",
     "test/browser/new/browser.ini",
 ]

mail/components/addrbook/test/browser/browser-jsm.ini

@@ -0,0 +1,16 @@
+[DEFAULT]
+head = head.js
+prefs =
+  mailnews.ldap.jsmodule=true
+  mail.provider.suppress_dialog_on_startup=true
+  mail.spotlight.firstRunDone=true
+  mail.winsearch.firstRunDone=true
+  mailnews.start_page.override_url=about:blank
+  mailnews.start_page.url=about:blank
+  signon.rememberSignons=true
+subsuite = thunderbird
+tags = addrbook
+dupe-manifest =
+
+[browser_ldap_search.js]
+support-files = ../../../../../mailnews/addrbook/test/unit/data/ldap_contacts.json

mail/components/addrbook/test/browser/browser.ini

@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head.js
 prefs =
+  mailnews.ldap.jsmodule=false
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
@@ -9,6 +10,7 @@ prefs =
   signon.rememberSignons=true
 subsuite = thunderbird
 tags = addrbook
+dupe-manifest =
 
 [browser_cardDAV_init.js]
 [browser_cardDAV_properties.js]

mail/components/addrbook/test/browser/new/browser-jsm.ini

@@ -0,0 +1,16 @@
+[DEFAULT]
+head = head.js
+prefs =
+  mailnews.ldap.jsmodule=true
+  mail.provider.suppress_dialog_on_startup=true
+  mail.spotlight.firstRunDone=true
+  mail.winsearch.firstRunDone=true
+  mailnews.start_page.override_url=about:blank
+  mailnews.start_page.url=about:blank
+  signon.rememberSignons=true
+subsuite = thunderbird
+tags = addrbook
+dupe-manifest =
+
+[browser_ldap_search.js]
+support-files = ../../../../../../mailnews/addrbook/test/unit/data/ldap_contacts.json

mail/components/addrbook/test/browser/new/browser.ini

@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head.js
 prefs =
+  mailnews.ldap.jsmodule=false
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
@@ -9,6 +10,7 @@ prefs =
   signon.rememberSignons=true
 subsuite = thunderbird
 tags = addrbook
+dupe-manifest =
 
 [browser_cardDAV_init.js]
 [browser_cardDAV_properties.js]

mailnews/addrbook/test/LDAPServer.jsm

@@ -22,6 +22,7 @@ var LDAPServer = {
   BindRequest: 0x60,
   UnbindRequest: 0x42,
   SearchRequest: 0x63,
+  AbandonRequest: 0x50,
 
   serverSocket: null,
 
@@ -89,11 +90,15 @@ var LDAPServer = {
     if (expectedOperation) {
       let actualOperation = data[index + 1];
 
-      // Unbind requests can happen at any point, when an nsLDAPConnection is
-      // destroyed. This is unpredictable, and irrelevant for testing. Ignore.
-      if (actualOperation == LDAPServer.UnbindRequest) {
+      // Unbind and abandon requests can happen at any point, when an
+      // nsLDAPConnection is destroyed. This is unpredictable, and irrelevant
+      // for testing. Ignore.
+      if (
+        actualOperation == LDAPServer.UnbindRequest ||
+        actualOperation == LDAPServer.AbandonRequest
+      ) {
         if (PRINT_DEBUG) {
-          console.log("Ignoring unbind request");
+          console.log("Ignoring unbind or abandon request");
         }
         return this.read(expectedOperation);
       }