From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 923C92BAE6 for ; Fri, 21 Sep 2018 18:25:48 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G2Sr43WOOdgc for ; Fri, 21 Sep 2018 18:25:47 -0400 (EDT) Received: from forward2j.cmail.yandex.net (forward2j.cmail.yandex.net [5.255.227.20]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 6A0322BA57 for ; Fri, 21 Sep 2018 18:25:47 -0400 (EDT) From: roman.habibov1@yandex.ru In-Reply-To: <20180921025347.ommfgqpn7v35vi6p@tkn_work_nb> References: <1536282019-17978-1-git-send-email-roman.habibov1@yandex.ru> <41907181536625411@iva8-8d7a47df0521.qloud-c.yandex.net> <41826271536625517@iva7-bd007c44f58e.qloud-c.yandex.net> <20180919133830.bvtnqh3ftbdukobh@tkn_work_nb> <5087171537491282@myt5-f9d71769b752.qloud-c.yandex.net> <20180921025347.ommfgqpn7v35vi6p@tkn_work_nb> Subject: [tarantool-patches] Re: [PATCH 2/2] test: add output filtering feature MIME-Version: 1.0 Date: Sat, 22 Sep 2018 01:25:45 +0300 Message-Id: <8261571537568745@myt4-ec1fcebe7be6.qloud-c.yandex.net> Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: Alexander Turenko Cc: "tarantool-patches@freelists.org" , Kirill Shcherbatov Hi! Thanks for review/ > > On Fri, Sep 21, 2018 at 03:54:42AM +0300, roman.habibov1@yandex.ru wrote: >>  Add output filtering feature for engine/savepoint.test. >> >>  Part of #3518. >>  --- >>  commit b8be4c51e29110f459bd58dba51d6546cd9da25b >>  Author: Roman Khabibov >>  Date: Fri Sep 21 03:28:04 2018 +0300 >> >>      test: add output filtering feature > > Please, describe the change in less abstract manner, like 'test: filter > line numbers from engine/savepoint'. Now the description looks like you > are implement this feature from scratch. Done. commit a3110d84a171ab886612fe89d2094e2e3bd30f7f Author: Roman Khabibov Date: Fri Sep 21 03:28:04 2018 +0300 test: filter line numbers from engine/savepoint Part of #3518 diff --git a/test/engine/savepoint.result b/test/engine/savepoint.result index a62a2e1..b3a918d 100644 --- a/test/engine/savepoint.result +++ b/test/engine/savepoint.result @@ -4,6 +4,10 @@ env = require('test_run') test_run = env.new() --- ... +test_run:cmd("push filter '(.builtin/.*.lua):[0-9]+' to '\\1'") +--- +- true +... -- gh-2025 box.savepoint s1 = nil --- @@ -14,7 +18,7 @@ s1 = box.savepoint() ... box.rollback_to_savepoint(s1) --- -- error: 'builtin/box/schema.lua:340: Usage: box.rollback_to_savepoint(savepoint)' +- error: 'builtin/box/schema.lua: Usage: box.rollback_to_savepoint(savepoint)' ... box.begin() s1 = box.savepoint() --- @@ -323,27 +327,27 @@ test_run:cmd("setopt delimiter ''"); ok1, errmsg1 --- - false -- 'builtin/box/schema.lua:340: Usage: box.rollback_to_savepoint(savepoint)' +- 'builtin/box/schema.lua: Usage: box.rollback_to_savepoint(savepoint)' ... ok2, errmsg2 --- - false -- 'builtin/box/schema.lua:340: Usage: box.rollback_to_savepoint(savepoint)' +- 'builtin/box/schema.lua: Usage: box.rollback_to_savepoint(savepoint)' ... ok3, errmsg3 --- - false -- 'builtin/box/schema.lua:340: Usage: box.rollback_to_savepoint(savepoint)' +- 'builtin/box/schema.lua: Usage: box.rollback_to_savepoint(savepoint)' ... ok4, errmsg4 --- - false -- 'builtin/box/schema.lua:340: Usage: box.rollback_to_savepoint(savepoint)' +- 'builtin/box/schema.lua: Usage: box.rollback_to_savepoint(savepoint)' ... ok5, errmsg5 --- - false -- 'builtin/box/schema.lua:340: Usage: box.rollback_to_savepoint(savepoint)' +- 'builtin/box/schema.lua: Usage: box.rollback_to_savepoint(savepoint)' ... s:select{} --- diff --git a/test/engine/savepoint.test.lua b/test/engine/savepoint.test.lua index de8f297..186ef85 100644 --- a/test/engine/savepoint.test.lua +++ b/test/engine/savepoint.test.lua @@ -1,5 +1,6 @@ env = require('test_run') test_run = env.new() +test_run:cmd("push filter '(.builtin/.*.lua):[0-9]+' to '\\1'") -- gh-2025 box.savepoint