tests: use deny helper method

Author: dougwilson

test/FakeServer.js

@@ -71,6 +71,14 @@ function FakeConnection(socket) {
   socket.on('data', this._handleData.bind(this));
 }
 
+FakeConnection.prototype.deny = function deny(message, errno) {
+  this._sendPacket(new Packets.ErrorPacket({
+    message : (message || 'Access Denied'),
+    errno   : (errno || Errors.ER_ACCESS_DENIED_ERROR)
+  }));
+  this._parser.resetPacketNumber();
+};
+
 FakeConnection.prototype.handshake = function(options) {
   this._handshakeOptions = options || {};
 
@@ -86,21 +94,11 @@ FakeConnection.prototype.handshake = function(options) {
   this._sendPacket(this._handshakeInitializationPacket);
 };
 
-FakeConnection.prototype.deny = function(message, errno) {
-  this._sendPacket(new Packets.ErrorPacket({
-    message : message,
-    errno   : errno
-  }));
-};
-
 FakeConnection.prototype._sendAuthResponse = function _sendAuthResponse(got, expected) {
   if (expected.toString('hex') === got.toString('hex')) {
     this._sendPacket(new Packets.OkPacket());
   } else {
-    this._sendPacket(new Packets.ErrorPacket({
-      message : 'expected ' + expected.toString('hex') + ' got ' + got.toString('hex'),
-      errno   : Errors.ER_ACCESS_DENIED_ERROR
-    }));
+    this.deny('expected ' + expected.toString('hex') + ' got ' + got.toString('hex'));
   }
 
   this._parser.resetPacketNumber();
@@ -309,11 +307,7 @@ FakeConnection.prototype._parsePacket = function() {
 
       if (!this.emit('changeUser', packet)) {
         if (packet.user === 'does-not-exist') {
-          this._sendPacket(new Packets.ErrorPacket({
-            errno   : Errors.ER_ACCESS_DENIED_ERROR,
-            message : 'User does not exist'
-          }));
-          this._parser.resetPacketNumber();
+          this.deny('User does not exist');
           break;
         } else if (packet.database === 'does-not-exist') {
           this._sendPacket(new Packets.ErrorPacket({

test/unit/connection/test-connect-error-event.js

@@ -18,5 +18,5 @@ server.listen(common.fakeServerPort, function (err) {
 });
 
 server.on('connection', function (conn) {
-  conn.deny('You suck.', common.Errors.ER_ACCESS_DENIED_ERROR);
+  conn.deny();
 });

test/unit/connection/test-connection-error.js

@@ -50,7 +50,7 @@ function end() {
 }
 
 server.on('connection', function(incomingConnection) {
-  incomingConnection.deny('You suck.', common.Errors.ER_HOST_NOT_PRIVILEGED);
+  incomingConnection.deny();
 });
 
 process.on('exit', function() {

test/unit/connection/test-fatal-connect-error.js

@@ -37,7 +37,7 @@ server.listen(common.fakeServerPort, function (err) {
 
 server.on('connection', function (conn) {
   if (count === 0) {
-    conn.deny('You suck.', common.Errors.ER_ACCESS_DENIED_ERROR);
+    conn.deny();
     return;
   }
 

test/unit/pool-cluster/test-connection-error.js

@@ -15,7 +15,7 @@ server.listen(common.fakeServerPort, function(err) {
 
   cluster.getConnection('MASTER', function (err) {
     assert.ok(err);
-    assert.equal(err.code, 'ER_HOST_NOT_PRIVILEGED');
+    assert.equal(err.code, 'ER_ACCESS_DENIED_ERROR');
     assert.equal(err.fatal, true);
     assert.equal(connCount, 5);
 
@@ -28,5 +28,5 @@ server.listen(common.fakeServerPort, function(err) {
 
 server.on('connection', function(incomingConnection) {
   connCount += 1;
-  incomingConnection.deny('You suck.', common.Errors.ER_HOST_NOT_PRIVILEGED);
+  incomingConnection.deny();
 });

test/unit/pool-cluster/test-connection-no-retry.js

@@ -12,7 +12,7 @@ server.listen(common.fakeServerPort, function(err) {
 
   cluster.getConnection('MASTER', function (err) {
     assert.ok(err);
-    assert.equal(err.code, 'ER_HOST_NOT_PRIVILEGED');
+    assert.equal(err.code, 'ER_ACCESS_DENIED_ERROR');
     assert.equal(err.fatal, true);
     assert.equal(connCount, 1);
 
@@ -25,5 +25,5 @@ server.listen(common.fakeServerPort, function(err) {
 
 server.on('connection', function (conn) {
   connCount += 1;
-  conn.deny('You suck.', common.Errors.ER_HOST_NOT_PRIVILEGED);
+  conn.deny();
 });

test/unit/pool-cluster/test-query-connection-error.js

@@ -15,11 +15,11 @@ server.listen(common.fakeServerPort, function (err) {
 
   pool.query('SELECT 1', function (err) {
     assert.ok(err, 'got error');
-    assert.equal(err.code, 'ER_HOST_NOT_PRIVILEGED');
+    assert.equal(err.code, 'ER_ACCESS_DENIED_ERROR');
     server.destroy();
   });
 });
 
 server.on('connection', function (conn) {
-  conn.deny('You suck.', common.Errors.ER_HOST_NOT_PRIVILEGED);
+  conn.deny();
 });

test/unit/pool/test-query-connection-error.js

@@ -8,12 +8,12 @@ server.listen(common.fakeServerPort, function (err) {
 
   pool.query('SELECT 1', function (err) {
     assert.ok(err, 'got error');
-    assert.equal(err.code, 'ER_HOST_NOT_PRIVILEGED');
+    assert.equal(err.code, 'ER_ACCESS_DENIED_ERROR');
     assert.equal(err.fatal, true);
     server.destroy();
   });
 });
 
 server.on('connection', function (conn) {
-  conn.deny('You suck.', common.Errors.ER_HOST_NOT_PRIVILEGED);
+  conn.deny();
 });

test/unit/pool/test-query-stream-connection-error.js

@@ -10,12 +10,12 @@ server.listen(common.fakeServerPort, function (err) {
 
   query.on('error', function (err) {
     assert.ok(err, 'got error');
-    assert.equal(err.code, 'ER_HOST_NOT_PRIVILEGED');
+    assert.equal(err.code, 'ER_ACCESS_DENIED_ERROR');
     assert.equal(err.fatal, true);
     server.destroy();
   });
 });
 
 server.on('connection', function (conn) {
-  conn.deny('You suck.', common.Errors.ER_HOST_NOT_PRIVILEGED);
+  conn.deny();
 });