Merge pull request #1068 from dex4er/upgrade-tls-with-error

smtp-connection: Ignore "end" events because it might be "error" after it
nodemailer · Oct 3, 2019 · 29751e7 · 29751e7
2 parents 7750e04 + 72bade9
commit 29751e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/lib/smtp-connection/index.js b/lib/smtp-connection/index.js
@@ -830,7 +830,9 @@ class SMTPConnection extends EventEmitter {
      * @event
      */
     _onEnd() {
-        this._destroy();
+        if (this._socket && !this._socket.destroyed) {
+            this._socket.destroy()
+        }
     }
 
     /**

diff --git a/test/smtp-connection/smtp-connection-test.js b/test/smtp-connection/smtp-connection-test.js
@@ -49,7 +49,6 @@ describe('SMTP-Connection Tests', function() {
                     stream.on('data', function() {});
                     stream.on('end', callback);
                 },
-                logger: false
             });
 
             insecureServer = new SMTPServer({
@@ -214,7 +213,7 @@ describe('SMTP-Connection Tests', function() {
             client.on('end', done);
         });
 
-        it('should receive end after STARTTLS', function(done) {
+        it('should close connection after STARTTLS', function(done) {
             let client = new SMTPConnection({
                 port: PORT_NUMBER,
                 logger: false
@@ -228,7 +227,7 @@ describe('SMTP-Connection Tests', function() {
             });
 
             client.on('error', function(err) {
-                expect(err).to.not.exist;
+                expect(err.message).to.equal("Connection closed unexpectedly");
             });
 
             client.on('end', done);

diff --git a/test/smtp-pool/smtp-pool-test.js b/test/smtp-pool/smtp-pool-test.js
@@ -330,7 +330,9 @@ describe('SMTP Pool Tests', function() {
                     )
                 },
                 function(err) {
-                    expect(err).to.not.exist;
+                    if (err) {
+                        expect(err.message).to.equal("Connection closed unexpectedly");
+                    }
                     callback();
                 }
             );