Merge cd7ea5c into d2aefc2

test/will.js

@@ -325,21 +325,25 @@ test('does not store multiple will with same clientid', function (t) {
   var opts = { clientId: 'abcde' }
 
   var broker = aedes()
-  var s = willConnect(setup(broker), opts, function () {
+
+  var s = willConnect(setup(broker, false), opts, function () {
     // gracefully close client so no will is sent
     s.inStream.end({
       cmd: 'disconnect'
     })
+  })
 
+  broker.on('clientDisconnect', function (c) {
     // reconnect same client with will
-    s = willConnect(setup(broker), opts, function () {
+    s = willConnect(setup(broker, false), opts, function () {
       // check that there are not 2 will messages for the same clientid
       s.broker.persistence.delWill({ id: opts.clientId }, function (err, packet) {
         t.error(err, 'no error')
         t.equal(packet.clientId, opts.clientId, 'will packet found')
         s.broker.persistence.delWill({ id: opts.clientId }, function (err, packet) {
           t.error(err, 'no error')
           t.equal(!!packet, false, 'no duplicated packets')
+          broker.close()
         })
       })
     })