fix: clear only the node_id in the router record

Closes #401

autopush/db.py

@@ -671,7 +671,7 @@ def clear_node(self, item):
             cond = "(node_id = :node) and (connected_at = :conn)"
             conn.put_item(
                 self.table.table_name,
-                item=item.get_raw_keys(),
+                item=self.encode(item),
                 condition_expression=cond,
                 expression_attribute_values=self.encode({
                     ":node": node_id,

autopush/tests/test_db.py

@@ -478,18 +478,23 @@ def test_node_clear(self):
 
         # Register a node user
         router.register_user(dict(uaid=dummy_uaid, node_id="asdf",
-                                  connected_at=1234))
+                                  connected_at=1234,
+                                  router_key="webpush"))
 
         # Verify
         user = router.get_uaid(dummy_uaid)
         eq_(user["node_id"], "asdf")
+        eq_(user["connected_at"], 1234)
+        eq_(user["router_key"], "webpush")
 
         # Clear
         router.clear_node(user)
 
         # Verify
         user = router.get_uaid(dummy_uaid)
         eq_(user.get("node_id"), None)
+        eq_(user["connected_at"], 1234)
+        eq_(user["router_key"], "webpush")
 
     def test_node_clear_fail(self):
         r = get_router_table()

autopush/tests/test_integration.py

@@ -293,6 +293,15 @@ def disconnect(self):
     def sleep(self, duration):
         time.sleep(duration)
 
+    def wait_for(self, func):
+        """Waits several seconds for a function to return True"""
+        times = 0
+        while not func():  # pragma: nocover
+            time.sleep(1)
+            times += 1
+            if times > 9:  # pragma: nocover
+                break
+
 
 class IntegrationBase(unittest.TestCase):
     track_objects = True
@@ -669,6 +678,7 @@ def test_hello_only_has_two_calls(self):
         result = yield client.hello()
         ok_(result != {})
         eq_(result["use_webpush"], True)
+        yield client.wait_for(lambda: len(db.DB_CALLS) == 2)
         eq_(db.DB_CALLS, ['register_user', 'fetch_messages'])
         db.DB_CALLS = []
         db.TRACK_DB_CALLS = False

autopush/tests/test_websocket.py

@@ -415,6 +415,7 @@ def check_result(msg):
 
     def test_hello_webpush_uses_one_db_call(self):
         db.TRACK_DB_CALLS = True
+        db.DB_CALLS = []
         self._connect()
         self._send_message(dict(messageType="hello", use_webpush=True,
                                 channelIDs=[]))