From: Ethan Jackson <ethan@nicira.com>
Date: Mon, 26 Sep 2011 23:12:33 +0000 (-0700)
Subject: test-jsonrpc: Help option doesn't work.
X-Git-Tag: v1.3.0~198
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=484185ec4e1329bbc42cf0c0d70f24c732b748f8;p=sliver-openvswitch.git

test-jsonrpc: Help option doesn't work.

The test-jsonrpc.py script didn't understand the "-h" option and
threw an exception when "--help" was supplied.
---

diff --git a/tests/test-jsonrpc.py b/tests/test-jsonrpc.py
index 781f1f473..9da3bd2d7 100644
--- a/tests/test-jsonrpc.py
+++ b/tests/test-jsonrpc.py
@@ -166,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"
@@ -212,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)
+    ovs.stream.usage("JSON-RPC", True, True)
     ovs.daemon.usage()
     sys.stdout.write("""
 Other options: