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 test-runner has been updated
via df298cada5a2adb4892b2e8db01f06dbcf636a18 (commit)
from 9db2803c48c2f2e089c556e861ad12dac8d74f88 (commit)
Summary of changes:
test/box/args.result | 18 ++++++++++++++++--
test/box/args.test | 6 ++++++
test/box/show.result | Bin 465 -> 2180 bytes
test/box/show.test | 14 ++++++++++++++
test/lib/test_suite.py | 7 +++++--
5 files changed, 41 insertions(+), 4 deletions(-)
commit df298cada5a2adb4892b2e8db01f06dbcf636a18
Author: Konstantin Osipov <[email protected]>
Date: Fri Dec 17 06:35:49 2010 +0300
Test-runner: more coverage.
Add coverage for (almost) all admin options.
@todo: test 'exit'
Add coverage for more test options.
Make test results more host-independent.
Extend lib/test_suite.py: if we filtered out
entire line from the result, don't write newline
to the result file.
diff --git a/test/box/args.result b/test/box/args.result
index f76f91d..24bba24 100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@ -1,6 +1,20 @@
tarantool_silverbox --no-such-option
-/opt/local/work/tarantool/_debug_box/tarantool_silverbox: unrecognized option
'--no-such-option'
-<time> <pid> 0/(null) _ F> PANIC
/opt/local/work/tarantool/core/tarantool.c:deamon is running
+tarantool_silverbox: unrecognized option '--no-such-option'
+<time> <pid> 0/(null) _ F> PANIC tarantool.c:deamon is running
+
+tarantool_silverbox --help
+tarantool_silverbox: unrecognized option '--help'
+<time> <pid> 0/(null) _ F> PANIC tarantool.c:deamon is running
+
+tarantool_silverbox --config
+tarantool_silverbox: option '--config' requires an argument
+<time> <pid> 0/(null) _ F> PANIC tarantool.c:deamon is running
+
+tarantool_silverbox --config tarantool.cfg
+<time> <pid> 0/(null) _ F> PANIC tarantool.c:deamon is running
+
+tarantool_silverbox --daemonize
+<time> <pid> 0/(null) _ F> PANIC tarantool.c:deamon is running
tarantool_silverbox --version
1.3.minor-<rev>-<commit>
diff --git a/test/box/args.test b/test/box/args.test
index b3e7794..9e68045 100644
--- a/test/box/args.test
+++ b/test/box/args.test
@@ -1,6 +1,12 @@
+sys.stdout.push_filter("(/\S+)+/tarantool", "tarantool")
sys.stdout.push_filter("^\d+\.\d+ \d+", "<time> <pid>")
server.test_option("--no-such-option")
+server.test_option("--help")
+server.test_option("--config")
+server.test_option("--config tarantool.cfg")
+server.test_option("--daemonize")
sys.stdout.pop_filter()
sys.stdout.push_filter("(\d\.\d)\.\d-\d+-\S+", "\\1.minor-<rev>-<commit>")
server.test_option("--version")
sys.stdout.pop_filter()
+sys.stdout.pop_filter()
diff --git a/test/box/show.result b/test/box/show.result
index e654c52..24a7b9e 100644
Binary files a/test/box/show.result and b/test/box/show.result differ
diff --git a/test/box/show.test b/test/box/show.test
index 9b931e5..dab20ac 100644
--- a/test/box/show.test
+++ b/test/box/show.test
@@ -2,4 +2,18 @@
#
exec admin "show stat"
exec admin "help"
+exec admin "show configuration"
+exec admin "show stat"
+exec admin "save coredump"
+exec admin "save snapshot"
+exec admin "exec module command"
+sys.stdout.push_filter("(\d\.\d)\.\d-\d+-\S+", "\\1.minor-<rev>-<commit>")
+sys.stdout.push_filter("pid: \d+", "pid: <pid>")
+exec admin "show info"
+sys.stdout.clear_all_filters()
+sys.stdout.push_filter(".*", "")
+exec admin "show fiber"
+exec admin "show slab"
+exec admin "show palloc"
+sys.stdout.clear_all_filters()
# vim: syntax=python
diff --git a/test/lib/test_suite.py b/test/lib/test_suite.py
index 2d3e2cf..7a36743 100644
--- a/test/lib/test_suite.py
+++ b/test/lib/test_suite.py
@@ -34,10 +34,13 @@ class FilteredStream:
just one line."""
fragment_stream = cStringIO.StringIO(fragment)
for line in fragment_stream:
+ original_len = len(line.strip())
for pattern, replacement in self.filters:
line = re.sub(pattern, replacement, line)
- self.stream.write(line)
-
+# don't write lines that are completely filtered out:
+ if original_len and len(line.strip()) == 0:
+ return
+ self.stream.write(line)
def push_filter(self, pattern, replacement):
self.filters.append([pattern, replacement])
def pop_filter(self):
--
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
