Skip to content

Commit 96215d2

Browse files
dougwilsondougwilson
committed
lint: fix line-endings in tests
1 parent 183aad1 commit 96215d2

File tree

4 files changed

+139
-139
lines changed

4 files changed

+139
-139
lines changed

‎test/unit/connection/test-connect-timeout.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
var common = require('../../common');
2-
var connection = common.createConnection({host: '1.1.1.1', port: common.fakeServerPort, connectTimeout: 500});
3-
var assert = require('assert');
4-
5-
var testTimeout = setTimeout(function() {
6-
connection.destroy();
7-
}, 5000);
8-
9-
var connectErr;
10-
connection.connect(function(err) {
11-
connectErr = err;
12-
clearTimeout(testTimeout);
13-
});
14-
15-
process.on('exit', function() {
16-
assert.ok(connectErr);
17-
assert.equal(connectErr.code, 'ETIMEDOUT');
18-
assert.equal(connectErr.syscall, 'connect');
19-
assert.equal(connectErr.fatal, true);
20-
});
1+
var common = require('../../common');
2+
var connection = common.createConnection({host: '1.1.1.1', port: common.fakeServerPort, connectTimeout: 500});
3+
var assert = require('assert');
4+
5+
var testTimeout = setTimeout(function() {
6+
connection.destroy();
7+
}, 5000);
8+
9+
var connectErr;
10+
connection.connect(function(err) {
11+
connectErr = err;
12+
clearTimeout(testTimeout);
13+
});
14+
15+
process.on('exit', function() {
16+
assert.ok(connectErr);
17+
assert.equal(connectErr.code, 'ETIMEDOUT');
18+
assert.equal(connectErr.syscall, 'connect');
19+
assert.equal(connectErr.fatal, true);
20+
});

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

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
var common = require('../../common');
2-
var connection = common.createConnection({port: common.fakeServerPort});
3-
var assert = require('assert');
4-
var Errors = require(common.lib + '/protocol/constants/errors');
5-
6-
var server = common.createFakeServer();
7-
8-
var connectErr;
9-
var finalErr;
10-
var queryErr1;
11-
var queryErr2;
12-
var queryErr3;
13-
var timeout;
14-
server.listen(common.fakeServerPort, function(err) {
15-
if (err) throw err;
16-
var waitCount = 4;
17-
18-
connection.connect(function(err) {
19-
connectErr = err;
20-
if (!--waitCount) end();
21-
});
22-
23-
connection.query('SELECT 1', function(err) {
24-
queryErr1 = err;
25-
connection.query('SELECT 1', function(err) {
26-
finalErr = err;
27-
if (!--waitCount) end();
28-
});
29-
});
30-
31-
process.nextTick(function() {
32-
connection.query('SELECT 1', function(err) {
33-
queryErr2 = err;
34-
if (!--waitCount) end();
35-
});
36-
});
37-
38-
setTimeout(function() {
39-
connection.query('SELECT 1', function(err) {
40-
queryErr3 = err;
41-
if (!--waitCount) end();
42-
});
43-
}, 200);
44-
45-
timeout = setTimeout(end, 2000);
46-
});
47-
48-
function end() {
49-
if (timeout) clearTimeout(timeout);
50-
server.destroy();
51-
}
52-
53-
server.on('connection', function(incomingConnection) {
54-
incomingConnection.deny('You suck.', Errors.ER_HOST_NOT_PRIVILEGED);
55-
});
56-
57-
process.on('exit', function() {
58-
assert.ok(connectErr);
59-
assert.ok(queryErr1);
60-
assert.ok(queryErr2);
61-
assert.ok(queryErr3);
62-
assert.ok(finalErr);
63-
assert.equal(finalErr.code, 'PROTOCOL_ENQUEUE_AFTER_FATAL_ERROR');
64-
});
1+
var common = require('../../common');
2+
var connection = common.createConnection({port: common.fakeServerPort});
3+
var assert = require('assert');
4+
var Errors = require(common.lib + '/protocol/constants/errors');
5+
6+
var server = common.createFakeServer();
7+
8+
var connectErr;
9+
var finalErr;
10+
var queryErr1;
11+
var queryErr2;
12+
var queryErr3;
13+
var timeout;
14+
server.listen(common.fakeServerPort, function(err) {
15+
if (err) throw err;
16+
var waitCount = 4;
17+
18+
connection.connect(function(err) {
19+
connectErr = err;
20+
if (!--waitCount) end();
21+
});
22+
23+
connection.query('SELECT 1', function(err) {
24+
queryErr1 = err;
25+
connection.query('SELECT 1', function(err) {
26+
finalErr = err;
27+
if (!--waitCount) end();
28+
});
29+
});
30+
31+
process.nextTick(function() {
32+
connection.query('SELECT 1', function(err) {
33+
queryErr2 = err;
34+
if (!--waitCount) end();
35+
});
36+
});
37+
38+
setTimeout(function() {
39+
connection.query('SELECT 1', function(err) {
40+
queryErr3 = err;
41+
if (!--waitCount) end();
42+
});
43+
}, 200);
44+
45+
timeout = setTimeout(end, 2000);
46+
});
47+
48+
function end() {
49+
if (timeout) clearTimeout(timeout);
50+
server.destroy();
51+
}
52+
53+
server.on('connection', function(incomingConnection) {
54+
incomingConnection.deny('You suck.', Errors.ER_HOST_NOT_PRIVILEGED);
55+
});
56+
57+
process.on('exit', function() {
58+
assert.ok(connectErr);
59+
assert.ok(queryErr1);
60+
assert.ok(queryErr2);
61+
assert.ok(queryErr3);
62+
assert.ok(finalErr);
63+
assert.equal(finalErr.code, 'PROTOCOL_ENQUEUE_AFTER_FATAL_ERROR');
64+
});

‎test/unit/connection/test-connection-ssl-denied.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
var assert = require('assert');
2-
var common = require('../../common');
3-
var connection = common.createConnection({
4-
port : common.fakeServerPort,
5-
ssl : 'Amazon RDS'
6-
});
7-
8-
var server = common.createFakeServer();
9-
10-
var connectErr;
11-
server.listen(common.fakeServerPort, function(err) {
12-
if (err) throw err;
13-
14-
connection.connect(function(err) {
15-
connectErr = err;
16-
server.destroy();
17-
});
18-
});
19-
20-
server.on('connection', function(incomingConnection) {
21-
incomingConnection.handshake();
22-
});
23-
24-
process.on('exit', function() {
25-
assert.ok(connectErr);
26-
assert.equal(connectErr.code, 'HANDSHAKE_NO_SSL_SUPPORT');
27-
assert.ok(connectErr.fatal);
28-
});
1+
var assert = require('assert');
2+
var common = require('../../common');
3+
var connection = common.createConnection({
4+
port : common.fakeServerPort,
5+
ssl : 'Amazon RDS'
6+
});
7+
8+
var server = common.createFakeServer();
9+
10+
var connectErr;
11+
server.listen(common.fakeServerPort, function(err) {
12+
if (err) throw err;
13+
14+
connection.connect(function(err) {
15+
connectErr = err;
16+
server.destroy();
17+
});
18+
});
19+
20+
server.on('connection', function(incomingConnection) {
21+
incomingConnection.handshake();
22+
});
23+
24+
process.on('exit', function() {
25+
assert.ok(connectErr);
26+
assert.equal(connectErr.code, 'HANDSHAKE_NO_SSL_SUPPORT');
27+
assert.ok(connectErr.fatal);
28+
});

‎test/unit/connection/test-connection-thread-id.js

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
var assert = require('assert');
2-
var common = require('../../common');
3-
var connection = common.createConnection({port: common.fakeServerPort});
4-
5-
var server = common.createFakeServer();
6-
7-
server.listen(common.fakeServerPort, function(err) {
8-
assert.ifError(err);
9-
assert.strictEqual(connection.threadId, null);
10-
11-
connection.connect(function(err) {
12-
assert.ifError(err);
13-
assert.strictEqual(connection.threadId, 42);
14-
15-
connection.end(function(err) {
16-
assert.ifError(err);
17-
assert.strictEqual(connection.threadId, 42);
18-
server.destroy();
19-
});
20-
});
21-
});
22-
23-
server.on('connection', function(incomingConnection) {
24-
incomingConnection.handshake({
25-
threadId : 42
26-
});
27-
});
1+
var assert = require('assert');
2+
var common = require('../../common');
3+
var connection = common.createConnection({port: common.fakeServerPort});
4+
5+
var server = common.createFakeServer();
6+
7+
server.listen(common.fakeServerPort, function(err) {
8+
assert.ifError(err);
9+
assert.strictEqual(connection.threadId, null);
10+
11+
connection.connect(function(err) {
12+
assert.ifError(err);
13+
assert.strictEqual(connection.threadId, 42);
14+
15+
connection.end(function(err) {
16+
assert.ifError(err);
17+
assert.strictEqual(connection.threadId, 42);
18+
server.destroy();
19+
});
20+
});
21+
});
22+
23+
server.on('connection', function(incomingConnection) {
24+
incomingConnection.handshake({
25+
threadId : 42
26+
});
27+
});

0 commit comments

Comments
 (0)