Merge pull request #119 from shravan-shandilya/master

fix for issue: 106
ethereum · Oct 26, 2016 · c877d00 · c877d00
2 parents cee5992 + fac9605
commit c877d00
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tests/filtering/test_filter_running_is_set_immediately.py b/tests/filtering/test_filter_running_is_set_immediately.py
@@ -0,0 +1,8 @@
+def test_filter_runs_immediately(web3):
+    seen_logs = []
+    txn_filter = web3.eth.filter({})
+    assert txn_filter.running is None
+
+    txn_filter.watch(lambda _: _)
+
+    assert txn_filter.running is True
diff --git a/tests/shh-module/test_shh_filter.py b/tests/shh-module/test_shh_filter.py
@@ -5,17 +5,15 @@ def test_shh_filter(web3, skip_if_testrpc):
     recieved_messages = []
     shh_filter = web3.shh.filter({"topics":[web3.fromAscii("test")]})
     shh_filter.watch(recieved_messages.append)
-    gevent.sleep(1)
 
     payloads = []
     payloads.append(str.encode("payload1"))
     web3.shh.post({"topics":[web3.fromAscii("test")], "payload":web3.fromAscii(payloads[len(payloads)-1])})
     gevent.sleep(1)
-    
+
     payloads.append(str.encode("payload2"))
     web3.shh.post({"topics":[web3.fromAscii("test")], "payload":web3.fromAscii(payloads[len(payloads)-1])})
     gevent.sleep(1)
-
     assert len(recieved_messages) > 1
 
     for message in recieved_messages:

diff --git a/web3/utils/filters.py b/web3/utils/filters.py
@@ -108,6 +108,7 @@ def watch(self, *callbacks):
 
         if not self.running:
             self.start()
+        gevent.sleep(0)
 
     def stop_watching(self, timeout=0):
         self.running = False