maybe ci pass

upringjs · Nov 3, 2016 · 9fa211c · 9fa211c
1 parent b13edc8
commit 9fa211c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 43 deletions.
diff --git a/lib/commands.js b/lib/commands.js
@@ -31,7 +31,7 @@ function load (kv) {
     tracker.on('moved', function () {
       entry.hasTracker = false
       const rs = streams.get(key) || []
-      rs.forEach((stream) => stream.destroy())
+      rs.forEach((stream) => stream.end())
       streams.delete(key)
       if (!entry.hasReplicator) {
         db.delete(key)
@@ -52,7 +52,7 @@ function load (kv) {
     logger.debug({ key }, 'configuring replicator')
     upring.replica(key, function () {
       entry.hasReplicator = false
-      setupTracker(entry, bigError, sendData)
+      setupTracker(entry, noop, sendData)
     })
   }
 
@@ -79,7 +79,7 @@ function load (kv) {
       }
     } else {
       if (!entry.hasReplicator) {
-        setupReplicator(entry, bigError, sendData)
+        setupReplicator(entry, sendData)
       }
     }
 
@@ -191,4 +191,6 @@ function load (kv) {
   }
 }
 
+function noop () {}
+
 module.exports = load
diff --git a/test/multi.test.js b/test/multi.test.js
@@ -48,6 +48,42 @@ test('get and put', function (t) {
   })
 })
 
+test('get empty', function (t) {
+  t.plan(7)
+
+  const a = build()
+  t.tearDown(a.close.bind(a))
+
+  a.upring.on('up', function () {
+    t.pass('a up')
+    const b = build(a)
+
+    t.tearDown(b.close.bind(b))
+
+    b.upring.on('up', function () {
+      t.pass('b up')
+
+      b.get('hello', function (err, res) {
+        t.error(err)
+        t.equal(res, undefined)
+
+        const c = build(a)
+
+        t.tearDown(c.close.bind(c))
+
+        c.upring.on('up', function () {
+          t.pass('c up')
+
+          c.get('hello', function (err, res) {
+            t.error(err)
+            t.equal(res, undefined)
+          })
+        })
+      })
+    })
+  })
+})
+
 test('moving data', function (t) {
   t.plan(13)
 
@@ -161,11 +197,13 @@ test('liveUpdates', function (t) {
           b.put(key, 'matteo', function (err) {
             t.error(err)
 
-            b.close(function () {
-              t.pass('closed')
+            stream.once('data', function () {
+              b.close(function () {
+                t.pass('closed')
 
-              a.put(key, 'luca', function (err) {
-                t.error(err)
+                a.put(key, 'luca', function (err) {
+                  t.error(err)
+                })
               })
             })
           })
@@ -174,39 +212,3 @@ test('liveUpdates', function (t) {
     })
   })
 })
-
-test('get empty', function (t) {
-  t.plan(7)
-
-  const a = build()
-  t.tearDown(a.close.bind(a))
-
-  a.upring.on('up', function () {
-    t.pass('a up')
-    const b = build(a)
-
-    t.tearDown(b.close.bind(b))
-
-    b.upring.on('up', function () {
-      t.pass('b up')
-
-      b.get('hello', function (err, res) {
-        t.error(err)
-        t.equal(res, undefined)
-
-        const c = build(a)
-
-        t.tearDown(c.close.bind(c))
-
-        c.upring.on('up', function () {
-          t.pass('c up')
-
-          c.get('hello', function (err, res) {
-            t.error(err)
-            t.equal(res, undefined)
-          })
-        })
-      })
-    })
-  })
-})