From 5c9e260f604e0f8da49a9db8a196f942817949a1 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 30 Aug 2013 18:33:43 +0400
Subject: [PATCH] Improve regular expressions in admin.test to work with
multile output.
---
test/box/admin.result | 10 ++++------
test/box/admin.test.py | 7 ++++++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/test/box/admin.result b/test/box/admin.result
index e813b4ae39..fb9b37b696 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -117,12 +117,10 @@ box.info()
recovery_lag: 0
uptime: <uptime>
build:
- flags: ' -fno-omit-frame-pointer -fno-stack-protector -fexceptions -funwind-tables
- -std=c11 -Wall -Wextra -Wno-sign-compare -Wno-strict-aliasing -Werror -pthread'
- target: Linux-i686-Debug
- compiler: /usr/bin/gcc /usr/bin/c++
- options: cmake . -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_STATIC=OFF -DENABLE_TRACE=ON
- -DENABLE_BACKTRACE=ON -DENABLE_CLIENT=ON
+ flags: <flags>
+ target: <target>
+ compiler: <compiler>
+ options: <options>
logger_pid: <pid>
config: tarantool.cfg
...
diff --git a/test/box/admin.test.py b/test/box/admin.test.py
index c919eae82b..7aac3777eb 100644
--- a/test/box/admin.test.py
+++ b/test/box/admin.test.py
@@ -20,7 +20,12 @@ sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?", "\\1.minor.patch-<rev>-<commit
sys.stdout.push_filter("pid: \d+", "pid: <pid>")
sys.stdout.push_filter("logger_pid: \d+", "pid: <pid>")
sys.stdout.push_filter("uptime: \d+", "uptime: <uptime>")
-sys.stdout.push_filter("uptime: \d+", "uptime: <uptime>")
+sys.stdout.push_filter("flags: .*", "flags: <flags>")
+sys.stdout.push_filter("build: .*", "build: <build>")
+sys.stdout.push_filter("options: .*", "options: <options>")
+sys.stdout.push_filter("target: .*", "target: <target>")
+sys.stdout.push_filter("compiler: .*", "compiler: <compiler>")
+sys.stdout.push_filter("^ [^:]+$", "")
sys.stdout.push_filter("(/\S+)+/tarantool", "tarantool")
admin("box.info()")
sys.stdout.clear_all_filters()
--
GitLab