stream.py: Make usage() function return a string.

[sliver-openvswitch.git] / tests / test-jsonrpc.py

diff --git a/tests/test-jsonrpc.py b/tests/test-jsonrpc.py
index fda9a03..5ce45ad 100644 (file)
--- a/tests/test-jsonrpc.py
+++ b/tests/test-jsonrpc.py
@@ -23,6 +23,7 @@ import ovs.jsonrpc
 import ovs.poller
 import ovs.stream
 
+
 def handle_rpc(rpc, msg):
     done = False
     reply = None
@@ -43,11 +44,12 @@ def handle_rpc(rpc, msg):
     else:
         rpc.error(errno.EPROTO)
         sys.stderr.write("unsolicited JSON-RPC reply or error\n")
-        
+
     if reply:
         rpc.send(reply)
     return done
 
+
 def do_listen(name):
     error, pstream = ovs.stream.PassiveStream.open(name)
     if error:
@@ -98,6 +100,7 @@ def do_listen(name):
         poller.block()
     pstream.close()
 
+
 def do_request(name, method, params_string):
     params = ovs.json.from_string(params_string)
     msg = ovs.jsonrpc.Message.create_request(method, params)
@@ -123,11 +126,12 @@ def do_request(name, method, params_string):
     if error:
         sys.stderr.write("error waiting for reply: %s\n" % os.strerror(error))
         sys.exit(1)
-    
+
     print ovs.json.to_string(msg.to_json())
 
     rpc.close()
-    
+
+
 def do_notify(name, method, params_string):
     params = ovs.json.from_string(params_string)
     msg = ovs.jsonrpc.Message.create_notify(method, params)
@@ -152,6 +156,7 @@ def do_notify(name, method, params_string):
 
     rpc.close()
 
+
 def main(argv):
     try:
         options, args = getopt.gnu_getopt(
@@ -161,7 +166,7 @@ def main(argv):
         sys.exit(1)
 
     for key, value in options:
-        if key in ['h', '--help']:
+        if key in ['-h', '--help']:
             usage()
         elif not ovs.daemon.parse_opt(key, value):
             sys.stderr.write("%s: unhandled option %s\n"
@@ -198,6 +203,7 @@ def main(argv):
 
     func(*args)
 
+
 def usage():
     sys.stdout.write("""\
 %s: JSON-RPC test utility for Python
@@ -206,7 +212,7 @@ usage: %s [OPTIONS] COMMAND [ARG...]
   request REMOTE METHOD PARAMS   send request, print reply
   notify REMOTE METHOD PARAMS  send notification and exit
 """ % (ovs.util.PROGRAM_NAME, ovs.util.PROGRAM_NAME))
-    ovs.stream.usage("JSON-RPC", True, True, True)
+    sys.stdout.write(ovs.stream.usage("JSON-RPC") + "\n")
     ovs.daemon.usage()
     sys.stdout.write("""
 Other options:
@@ -214,6 +220,6 @@ Other options:
 """)
     sys.exit(0)
 
+
 if __name__ == '__main__':
     main(sys.argv)
-