python: Call 'wait' methods correctly in jsonrpc and stream code.

Bug #12301.
Reported-by: Mike Kruze <mkruze@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index cf08131327b77bd316e6cb462f90f8beb6581ce7..a054401b2783f30140170cba2902cceebe9a410a 100644 (file)
--- a/python/ovs/jsonrpc.py
+++ b/python/ovs/jsonrpc.py
@@ -210,7 +210,7 @@ class Connection(object):
         if not self.status:
             self.stream.run_wait(poller)
             if len(self.output):
-                self.stream.send_wait()
+                self.stream.send_wait(poller)
 
     def get_status(self):
         return self.status

diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index 82ea0c126c51ba462dd7f70b7f20a8ab2574e2db..aa512f6277cb37e29e977d9848b03a68e714904c 100644 (file)
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -113,7 +113,7 @@ class Stream(object):
                     break
                 stream.run()
                 poller = ovs.poller.Poller()
-                stream.run_wait()
+                stream.run_wait(poller)
                 stream.connect_wait(poller)
                 poller.block()
             assert error != errno.EINPROGRESS