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 25b0229..ed2b4c5 100644 (file)
--- a/python/ovs/jsonrpc.py
+++ b/python/ovs/jsonrpc.py
@@ -209,7 +209,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 7ea9e46..5c065e4 100644 (file)
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -105,7 +105,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