This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch core-help has been updated
via 75be04a624ef15935cef7a489b96b10f817109f4 (commit)
from 2750e1d9209141470427f85bf94dc707eeea313d (commit)
Summary of changes:
test/box/args.result | 22 +++++++++++-----------
test/box/args.test | 6 ++----
2 files changed, 13 insertions(+), 15 deletions(-)
commit 75be04a624ef15935cef7a489b96b10f817109f4
Author: Yuriy Vostrikov <[email protected]>
Date: Wed Dec 22 17:17:35 2010 +0300
[core] Simplify tests.
diff --git a/test/box/args.result b/test/box/args.result
index f743cd7..9afa75f 100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@ -1,12 +1,3 @@
-tarantool_silverbox -Z
-tarantool_silverbox: -Z: unknown option
-
-tarantool_silverbox --no-such-option
-tarantool_silverbox: --no-such-option: unknown option
-
-tarantool_silverbox --version --no-such-option
-tarantool_silverbox: --no-such-option: unknown option
-
tarantool_silverbox --help
Tarantool -- an efficient in-memory data store.
Usage: tarantool_silverbox [OPTIONS]
@@ -23,7 +14,7 @@ Usage: tarantool_silverbox [OPTIONS]
-h, --help display this help and exit
-V, --version print program version and exit
-Please visit project home page at %launchpad
+Please visit project home page at http://launchpad.net/tarantool
to see online documentation, submit bugs or contribute a patch.
tarantool_silverbox -h
@@ -42,9 +33,18 @@ Usage: tarantool_silverbox [OPTIONS]
-h, --help display this help and exit
-V, --version print program version and exit
-Please visit project home page at %launchpad
+Please visit project home page at http://launchpad.net/tarantool
to see online documentation, submit bugs or contribute a patch.
+tarantool_silverbox -Z
+tarantool_silverbox: -Z: unknown option
+
+tarantool_silverbox --no-such-option
+tarantool_silverbox: --no-such-option: unknown option
+
+tarantool_silverbox --version --no-such-option
+tarantool_silverbox: --no-such-option: unknown option
+
tarantool_silverbox --config
tarantool_silverbox: --config: option requires an option argument
diff --git a/test/box/args.test b/test/box/args.test
index f5e4056..8ff61b7 100644
--- a/test/box/args.test
+++ b/test/box/args.test
@@ -1,11 +1,10 @@
-sys.stdout.push_filter("http://launchpad.net/tarantool";, "%launchpad")
+server.test_option("--help")
+server.test_option("-h")
sys.stdout.push_filter("(/\S+)+/tarantool", "tarantool")
sys.stdout.push_filter("^\d+\.\d+ \d+", "<time> <pid>")
server.test_option("-Z")
server.test_option("--no-such-option")
server.test_option("--version --no-such-option")
-server.test_option("--help")
-server.test_option("-h")
server.test_option("--config")
server.test_option("-c")
server.test_option("--config tarantool.cfg")
@@ -16,4 +15,3 @@ server.test_option("--version")
server.test_option("-V ")
sys.stdout.pop_filter()
sys.stdout.pop_filter()
-sys.stdout.pop_filter()
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
