From 0df9a413fc78811a4ba096e08aaa0f1c76248bef Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Thu, 24 Feb 2011 22:50:55 +0300
Subject: [PATCH] Fix a build failure in buildbot.
Correct a regexp pattern in test suppression filter
to work in a more modern version of python.
In the new python \S matches '"', and the test
output is different compared to the recorded one.
---
test/box/args.test | 2 +-
test/box/show.test | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/box/args.test b/test/box/args.test
index 05e942901d..fa2595804f 100644
--- a/test/box/args.test
+++ b/test/box/args.test
@@ -9,7 +9,7 @@ server.test_option("-c")
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.patch-<rev>-<commit>")
+sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?", "\\1.minor.patch-<rev>-<commit>")
server.test_option("--version")
server.test_option("-V ")
sys.stdout.pop_filter()
diff --git a/test/box/show.test b/test/box/show.test
index 1d0472ceb1..d31da674f2 100644
--- a/test/box/show.test
+++ b/test/box/show.test
@@ -13,7 +13,7 @@ exec sql "insert into t0 values (1, 'tuple')"
exec admin "save snapshot"
exec sql "delete from t0 where k0 = 1"
exec admin "exec module command"
-sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\S+)?", "\\1.minor.patch-<rev>-<commit>")
+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("uptime: \d+", "uptime: <uptime>")
exec admin "show info"
--
GitLab