Update tests to disconnect themselves

Now that the library can disconnect itself and not keep the node process
running with open handles, we can update the tests to disconnect and let
the processes exit naturally, rather than forcing it with
`process.exit()`.

Author: bryanburgers

test/client-call-add.test.js

@@ -18,6 +18,7 @@ withService('service.js', function(err, done) {
 			iface.Add(109, 201, function(err, result) {
 				tap.equal(result, 310);
 				done();
+				bus.disconnect();
 			});
 		});
 	});

test/client-call-noargs.test.js

@@ -18,6 +18,7 @@ withService('service.js', function(err, done) {
 			iface.NoArgs(function(err, result) {
 				tap.equal(result, 'result!');
 				done();
+				bus.disconnect();
 			});
 		});
 	});

test/client-call-timeout.test.js

@@ -14,6 +14,7 @@ withService('service.js', function(err, done) {
 			tap.notSame(err, null);
 			tap.same(result, null);
 			done();
+			bus.disconnect();
 		});
 	});
 });

test/client-property.test.js

@@ -24,6 +24,7 @@ withService('service.js', function(err, done) {
 							tap.equal(props.Author, 'Douglas Adams');
 							tap.equal(props.URL, 'http://stem.mandice.org');
 							done();
+							bus.disconnect();
 						});
 					});
 				});

test/client-signal.test.js

@@ -13,6 +13,7 @@ withService('service.js', function(err, done) {
 		iface.on('pump', function() {
 			tap.pass('Signal received');
 			done();
+			bus.disconnect();
 		});
 	});
 });

test/service-create-remove-object.test.js

@@ -22,6 +22,7 @@ withService('service-dynamic.js', function(err, done) {
 							checkInterface(bus, '2', function(err, result) {
 								tap.equal(result, false);
 								done();
+								bus.disconnect();
 							});
 						});
 					});

test/service-dynamic.js

@@ -35,6 +35,10 @@ process.on('message', function(msg) {
 			process.send({ type: 'remove', value: value });
 		}
 	}
+	else if (msg.message === 'done') {
+		service.disconnect();
+		process.removeAllListeners('message');
+	}
 });
 
 process.send({ message: 'ready' });

test/service.js

@@ -21,7 +21,7 @@ iface1.addMethod('Add', { in: [DBus.Define(Number), DBus.Define(Number)], out: D
 iface1.addMethod('LongProcess', { out: DBus.Define(Number) }, function(callback) {
 	setTimeout(function() {
 		callback(0);
-	}, 5000);
+	}, 5000).unref();
 });
 
 var author = 'Fred Chien';
@@ -57,10 +57,11 @@ iface1.addSignal('pump', {
 iface1.update();
 
 // Emit signal per one second
-setInterval(function() {
+var interval = setInterval(function() {
 	counter++;
 	iface1.emit('pump', counter);
 }, 1000);
+interval.unref();
 
 // Create second interface
 var iface2 = obj.createInterface('test.dbus.TestService.Interface2');
@@ -72,3 +73,10 @@ iface2.addMethod('Hello', { out: DBus.Define(String) }, function(callback) {
 iface2.update();
 
 process.send({ message: 'ready' });
+process.on('message', function(msg) {
+	if (msg.message === 'done') {
+		clearInterval(interval);
+		service.disconnect();
+		process.removeAllListeners('message');
+	}
+});

test/with-service.js

@@ -6,7 +6,7 @@ function withService(name, callback) {
 	var p = child_process.fork(path.join(__dirname, name));
 
 	var done = function() {
-		p.kill();
+		p.send({ message: 'done' });
 	}
 
 	done.process = p;
@@ -19,15 +19,6 @@ function withService(name, callback) {
 			callback(null, done);
 		}
 	});
-
-	p.on('exit', function() {
-		// Because there is no way to shut down a connection, the node
-		// process keeps running after we're done with our testing. The
-		// way we handle this, then, is that when a test is done using
-		// the service, we kill the process that we started. And once
-		// that process has exited, we kill the current process.
-		process.exit();
-	});
 }
 
 module.exports = withService;