divmod-dev team mailing list archive

[Tristan Seligmann <mithrandi@xxxxxxxxxxxxx>]

Tristan Seligmann has proposed merging lp:~divmod-dev/divmod.org/1208306-usage-text into lp:divmod.org.

Requested reviews:
  Divmod-dev (divmod-dev)
Related bugs:
  Bug #1208306 in Divmod Axiom: "Twisted usage text has changed"
  https://bugs.launchpad.net/divmod-axiom/+bug/1208306

For more details, see:
https://code.launchpad.net/~divmod-dev/divmod.org/1208306-usage-text/+merge/178489


-- 
https://code.launchpad.net/~divmod-dev/divmod.org/1208306-usage-text/+merge/178489
Your team Divmod-dev is requested to review the proposed merge of lp:~divmod-dev/divmod.org/1208306-usage-text into lp:divmod.org.

=== modified file 'Mantissa/xmantissa/test/test_port.py'
--- Mantissa/xmantissa/test/test_port.py	2008-09-20 01:06:47 +0000
+++ Mantissa/xmantissa/test/test_port.py	2013-08-05 03:49:26 +0000
@@ -509,7 +509,7 @@
         # to verify that help text is going to be shown to a user.  -exarkun
         "Usage: axiomatic [options] port [options]\n"
         "Options:\n"
-        "      --version  \n"
+        "      --version  Display Twisted version and exit.\n"
         "      --help     Display this help and exit.\n"
         "\n"
         "This command allows for the inspection and modification of the "
@@ -542,7 +542,7 @@
     _listHelpText = (
         "Usage: axiomatic [options] port [options] list [options]\n"
         "Options:\n"
-        "      --version  \n"
+        "      --version  Display Twisted version and exit.\n"
         "      --help     Display this help and exit.\n"
         "\n"
         "Show the port/factory bindings in an Axiom store.\n"
@@ -700,7 +700,7 @@
         "Usage: axiomatic [options] port [options] delete [options]\n"
         "Options:\n"
         "      --port-identifier=  Identify a port for deletion.\n"
-        "      --version           \n"
+        "      --version           Display Twisted version and exit.\n"
         "      --help              Display this help and exit.\n"
         "\n"
         "Delete an existing port binding from a factory. If a server is "
@@ -803,7 +803,7 @@
         "      --factory-identifier=  Identifier for a protocol factory to "
         "associate with\n"
         "                             the new port.\n"
-        "      --version              \n"
+        "      --version              Display Twisted version and exit.\n"
         "      --help                 Display this help and exit.\n"
         "\n"
         "Create a new port binding for an existing factory. If a server is "
@@ -1056,7 +1056,7 @@
             ["create", "--strport", "quux:foo",
              "--factory-identifier", str(factory.storeID)])
         self.assertEqual(
-            "Unrecognized port type.\n", sys.stdout.getvalue())
+            "'quux:foo' is not a valid port description.\n", sys.stdout.getvalue())
 
 
     def test_createUnsupported(self):