Skip to content

Commit 7fba329

Browse files
imyllerimyller
committed
Fixed tests for io.js
1 parent 9cc43eb commit 7fba329

File tree

1 file changed

+75
-47
lines changed

1 file changed

+75
-47
lines changed

‎test/06_watch.js

+75-47
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,17 @@ describe('resolvmon watch', function () {
1616

1717
var temporary_conf = temp.openSync('resolv.conf').path;
1818

19-
after(function () {
20-
try {
21-
fs.unlinkSync(temporary_conf);
22-
} catch (ex) {
23-
}
24-
});
25-
26-
beforeEach(function () {
19+
before(function (done) {
2720

2821
try {
29-
fs.unlinkSync(temporary_conf);
22+
fs.unlink(temporary_conf, done);
3023
} catch (ex) {
24+
done();
3125
}
3226

3327
});
3428

35-
afterEach(function () {
29+
afterEach(function (done) {
3630

3731
try {
3832
resolvmon.removeAllListeners();
@@ -50,29 +44,47 @@ describe('resolvmon watch', function () {
5044
} catch (ex) {
5145
}
5246

47+
try {
48+
fs.unlink(temporary_conf, function (err) {
49+
done();
50+
});
51+
} catch (ex) {
52+
done();
53+
}
54+
5355
});
5456

5557
it('detect resolv.conf create', function (done) {
5658

57-
resolvmon.setPath(temporary_conf);
59+
fs.unlink(temporary_conf, function (err) {
5860

59-
resolvmon.on('error', function (err) {
6061
expect(err).not.to.be.defined;
61-
done(err);
62-
});
6362

64-
resolvmon.on('update', function (nameservers) {
63+
if (err) {
64+
return done();
65+
}
6566

66-
expect(nameservers).to.be.defined;
67-
expect(nameservers).to.be.instanceof(Array);
68-
expect(nameservers).to.eql(['127.0.0.10', '127.0.0.20']);
69-
done();
70-
});
67+
resolvmon.setPath(temporary_conf);
7168

72-
resolvmon.start();
69+
resolvmon.on('error', function (err) {
70+
expect(err).not.to.be.defined;
71+
done(err);
72+
});
73+
74+
resolvmon.on('update', function (nameservers) {
75+
76+
expect(nameservers).to.be.defined;
77+
expect(nameservers).to.be.instanceof(Array);
78+
expect(nameservers).to.eql(['127.0.0.10', '127.0.0.20']);
79+
done();
80+
});
81+
82+
resolvmon.start();
83+
84+
process.nextTick(function () {
85+
fs.writeFileSync(temporary_conf, "nameserver 127.0.0.10\nnameserver 127.0.0.20\n");
86+
});
7387

74-
process.nextTick(function () {
75-
fs.writeFileSync(temporary_conf, "nameserver 127.0.0.10\nnameserver 127.0.0.20\n");
7688
});
7789

7890
});
@@ -90,16 +102,16 @@ describe('resolvmon watch', function () {
90102
}
91103

92104
resolvmon.on('error', function (err) {
105+
resolvmon.removeAllListeners();
93106
expect(err).not.to.be.defined;
94107
done(err);
95108
});
96109

97110
resolvmon.on('update', function (nameservers) {
98-
111+
resolvmon.removeAllListeners();
99112
expect(nameservers).to.be.defined;
100113
expect(nameservers).to.be.instanceof(Array);
101114
expect(nameservers).to.eql([]);
102-
103115
done();
104116

105117
});
@@ -127,18 +139,17 @@ describe('resolvmon watch', function () {
127139
}
128140

129141
resolvmon.on('error', function (err) {
142+
resolvmon.removeAllListeners();
130143
expect(err).not.to.be.defined;
131144
done(err);
132145
});
133146

134147
resolvmon.on('update', function (nameservers) {
135-
148+
resolvmon.removeAllListeners();
136149
expect(nameservers).to.be.defined;
137150
expect(nameservers).to.be.instanceof(Array);
138151
expect(nameservers).to.eql(['127.0.0.12', '127.0.0.23', '127.0.0.34', '127.0.0.45']);
139-
140152
done();
141-
142153
});
143154

144155
resolvmon.start();
@@ -165,12 +176,13 @@ describe('resolvmon watch', function () {
165176
}
166177

167178
resolvmon.on('error', function (err) {
179+
resolvmon.removeAllListeners();
168180
expect(err).not.to.be.defined;
169181
done(err);
170182
});
171183

172184
resolvmon.on('update', function (nameservers) {
173-
185+
resolvmon.removeAllListeners();
174186
expect(nameservers).to.be.defined;
175187
expect(nameservers).to.be.instanceof(Array);
176188
expect(nameservers).to.eql(['127.0.0.100', '127.0.0.200']);
@@ -191,32 +203,44 @@ describe('resolvmon watch', function () {
191203

192204
resolvmon.setPath(temporary_conf);
193205

194-
fs.writeFileSync(temporary_conf, "nameserver 127.0.0.91\nnameserver 127.0.0.81\n");
206+
fs.writeFile(temporary_conf, "nameserver 127.0.0.91\nnameserver 127.0.0.81\n", function (err) {
195207

196-
resolvmon.on('error', function (err) {
197208
expect(err).not.to.be.defined;
198-
done(err);
199-
});
200209

201-
resolvmon.on('update', function (nameservers) {
210+
if (err) {
211+
return done();
212+
}
202213

203-
expect(nameservers).to.be.defined;
204-
expect(nameservers).to.be.instanceof(Array);
205-
expect(nameservers).to.eql([]);
206-
done();
207-
});
214+
resolvmon.on('error', function (err) {
215+
resolvmon.removeAllListeners();
216+
expect(err).not.to.be.defined;
217+
done(err);
218+
});
208219

209-
resolvmon.start();
220+
resolvmon.on('update', function (nameservers) {
221+
resolvmon.removeAllListeners();
222+
expect(nameservers).to.be.defined;
223+
expect(nameservers).to.be.instanceof(Array);
224+
expect(nameservers).to.eql([]);
225+
done();
226+
});
227+
228+
resolvmon.start();
229+
230+
process.nextTick(function () {
231+
fs.renameSync(temporary_conf, temporary_conf + '.renamed');
232+
});
210233

211-
process.nextTick(function () {
212-
fs.renameSync(temporary_conf, temporary_conf + '.renamed');
213234
});
214235

215-
after(function () {
236+
after(function (done) {
216237

217238
try {
218-
fs.unlinkSync(temporary_conf + '.renamed');
239+
fs.unlink(temporary_conf + '.renamed', function (err) {
240+
done();
241+
});
219242
} catch (ex) {
243+
done();
220244
}
221245

222246
});
@@ -230,12 +254,13 @@ describe('resolvmon watch', function () {
230254
fs.writeFileSync(temporary_conf + '.renamed', "nameserver 127.0.0.51\nnameserver 127.0.0.61\n");
231255

232256
resolvmon.on('error', function (err) {
257+
resolvmon.removeAllListeners();
233258
expect(err).not.to.be.defined;
234259
done(err);
235260
});
236261

237262
resolvmon.on('update', function (nameservers) {
238-
263+
resolvmon.removeAllListeners();
239264
expect(nameservers).to.be.defined;
240265
expect(nameservers).to.be.instanceof(Array);
241266
expect(nameservers).to.eql(['127.0.0.51', '127.0.0.61']);
@@ -248,11 +273,14 @@ describe('resolvmon watch', function () {
248273
fs.renameSync(temporary_conf + '.renamed', temporary_conf);
249274
});
250275

251-
after(function () {
276+
after(function (done) {
252277

253278
try {
254-
fs.unlinkSync(temporary_conf + '.renamed');
279+
fs.unlink(temporary_conf + '.renamed', function (err) {
280+
done();
281+
});
255282
} catch (ex) {
283+
done();
256284
}
257285

258286
});

0 commit comments

Comments
 (0)