From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 55DEA42EF5C for ; Mon, 22 Jun 2020 11:55:47 +0300 (MSK) Received: by mail-lj1-f196.google.com with SMTP id z9so18328380ljh.13 for ; Mon, 22 Jun 2020 01:55:47 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) From: =?utf-8?B?0JjQu9GM0Y8g0JrQvtC90Y7RhdC+0LI=?= In-Reply-To: <5480098d-e807-e360-4ab7-1feb41447000@tarantool.org> Date: Mon, 22 Jun 2020 11:55:34 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: <67c75c01-8503-2355-e1f7-9644def2179c@tarantool.org> <6b8b0f63-0a3f-d3ae-7596-2611ea433d44@tarantool.org> <6D02837E-BBEB-4CB9-806F-D5D8E66014B1@gmail.com> <8DEA1673-33E4-4930-9C61-45DEC371FE73@gmail.com> <642b3dbc-98f1-e09a-a71c-f94b8a6091cc@tarantool.org> <7425E178-64A5-4D73-860D-3D5BD0C95CF5@gmail.com> <5480098d-e807-e360-4ab7-1feb41447000@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 2/2] feedback: collect db engines and index features List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Hi, I=E2=80=99ve removed unrelated hunk, thanks for noticing. > On 20 Jun 2020, at 02:49, Vladislav Shpilevoy = wrote: >=20 >> diff --git a/test/box-tap/feedback_daemon.test.lua = b/test/box-tap/feedback_daemon.test.lua >> index d4adb71f1..1fd5778b4 100755 >> --- a/test/box-tap/feedback_daemon.test.lua >> +++ b/test/box-tap/feedback_daemon.test.lua >> @@ -115,21 +115,89 @@ check("feedback after feedback send_test") >>=20 >> daemon.stop() >>=20 >> +actual =3D daemon.generate_feedback() >> box.feedback.save("feedback.json") >> local fio =3D require("fio") >> local fh =3D fio.open("feedback.json") >> test:ok(fh, "file is created") >> local file_data =3D fh:read() >> -test:is(file_data, feedback_save, "data is equal") >> +test:is(file_data, json.encode(actual), "data is equal") >> fh:close() >> fio.unlink("feedback.json") >>=20 >> server:close() >> -- check it does not fail without server >> -local daemon =3D box.internal.feedback_daemon >> +daemon =3D box.internal.feedback_daemon >=20 > This diff hunk is not related to the patch. I reverted it > and the test passed. >=20 diff --git a/test/box-tap/feedback_daemon.test.lua = b/test/box-tap/feedback_daemon.test.lua index 1fd5778b4..330442f2e 100755 --- a/test/box-tap/feedback_daemon.test.lua +++ b/test/box-tap/feedback_daemon.test.lua @@ -115,19 +115,18 @@ check("feedback after feedback send_test") =20 daemon.stop() =20 -actual =3D daemon.generate_feedback() box.feedback.save("feedback.json") local fio =3D require("fio") local fh =3D fio.open("feedback.json") test:ok(fh, "file is created") local file_data =3D fh:read() -test:is(file_data, json.encode(actual), "data is equal") +test:is(file_data, feedback_save, "data is equal") fh:close() fio.unlink("feedback.json") =20 server:close() -- check it does not fail without server -daemon =3D box.internal.feedback_daemon +local daemon =3D box.internal.feedback_daemon daemon.start() daemon.send_test() daemon.stop()