Merge pull request #43 from littleskunk/develop

Bugfix for ignored pings

dataserv/Farmer.py

@@ -113,7 +113,7 @@ def ping(self):
 
         """
         farmer = self.lookup()
-        time_limit = (datetime.utcnow() - farmer.last_seen).seconds <= app.config["MAX_PING"]
+        time_limit = (datetime.utcnow() - farmer.last_seen).seconds >= app.config["MAX_PING"]
 
         if time_limit:
             farmer.last_seen = datetime.utcnow()

tests/test_Farmer.py

@@ -61,6 +61,7 @@ def test_ping(self):
 
         # get register time, and make sure the ping work
         register_time = farmer.last_seen
+        time.sleep(app.config["MAX_PING"] + 1) # ping faster than max_ping would be ignored
         farmer.ping()  # update last seen
         ping_time = farmer.last_seen
         self.assertTrue(register_time < ping_time)
@@ -69,13 +70,13 @@ def test_ping_time_limit(self):
         farmer = Farmer(addresses["beta"])
         farmer.register()
 
-        farmer.ping()
+        register_time = farmer.last_seen
         time.sleep(2)
         farmer.ping()
 
-        # should still be around 2
-        delta_seconds = int((farmer.last_seen - datetime.utcnow()).seconds)
-        self.assertNotEqual(delta_seconds, 0)
+        # should still be around 0
+        delta_seconds = int((farmer.last_seen - register_time).seconds)
+        self.assertEqual(delta_seconds, 0)
 
     def test_height(self):
         farmer = Farmer(addresses["gamma"])
@@ -101,6 +102,7 @@ def test_audit(self):
 
         # get register time, and make sure the ping work
         register_time = farmer.last_seen
+        time.sleep(app.config["MAX_PING"] + 1) # ping faster than max_ping would be ignored
         farmer.audit()
         ping_time = farmer.last_seen
         self.assertTrue(register_time < ping_time)