Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Илья Конюхов" <runsfor@gmail.com>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH 2/2] feedback: collect db engines and index features
Date: Mon, 22 Jun 2020 11:55:34 +0300	[thread overview]
Message-ID: <D0386F8C-09C6-47EB-BA98-4CA663BE4936@gmail.com> (raw)
In-Reply-To: <5480098d-e807-e360-4ab7-1feb41447000@tarantool.org>

Hi,

I’ve removed unrelated hunk, thanks for noticing.

> On 20 Jun 2020, at 02:49, Vladislav Shpilevoy <v.shpilevoy@tarantool.org> wrote:
> 
>> 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")
>> 
>> daemon.stop()
>> 
>> +actual = daemon.generate_feedback()
>> box.feedback.save("feedback.json")
>> local fio = require("fio")
>> local fh = fio.open("feedback.json")
>> test:ok(fh, "file is created")
>> local file_data = 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")
>> 
>> server:close()
>> -- check it does not fail without server
>> -local daemon = box.internal.feedback_daemon
>> +daemon = box.internal.feedback_daemon
> 
> This diff hunk is not related to the patch. I reverted it
> and the test passed.
> 

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")
 
 daemon.stop()
 
-actual = daemon.generate_feedback()
 box.feedback.save("feedback.json")
 local fio = require("fio")
 local fh = fio.open("feedback.json")
 test:ok(fh, "file is created")
 local file_data = 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")
 
 server:close()
 -- check it does not fail without server
-daemon = box.internal.feedback_daemon
+local daemon = box.internal.feedback_daemon
 daemon.start()
 daemon.send_test()
 daemon.stop()

  reply	other threads:[~2020-06-22  8:55 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-05  8:35 [Tarantool-patches] [PATCH 0/2] Extend feedback module report Ilya Konyukhov
2020-06-05  8:35 ` [Tarantool-patches] [PATCH 1/2] feedback: determine runtime platform info Ilya Konyukhov
2020-06-07 16:45   ` Vladislav Shpilevoy
2020-06-09 23:05     ` Илья Конюхов
2020-06-11 19:32       ` Vladislav Shpilevoy
2020-07-01  0:16       ` Alexander Turenko
2020-07-05  2:14         ` Alexander Turenko
2020-06-05  8:35 ` [Tarantool-patches] [PATCH 2/2] feedback: collect db engines and index features Ilya Konyukhov
2020-06-07 16:45   ` Vladislav Shpilevoy
2020-06-09 23:06     ` Илья Конюхов
2020-06-11 19:32       ` Vladislav Shpilevoy
2020-06-17  8:59         ` Илья Конюхов
2020-06-17 22:53           ` Vladislav Shpilevoy
2020-06-18 15:42             ` Илья Конюхов
2020-06-18 23:02               ` Vladislav Shpilevoy
2020-06-19 14:01                 ` Илья Конюхов
2020-06-19 23:49                   ` Vladislav Shpilevoy
2020-06-22  8:55                     ` Илья Конюхов [this message]
2020-07-01  0:15   ` Alexander Turenko
2020-07-03 12:05     ` Илья Конюхов
2020-07-05  2:10       ` Alexander Turenko
2020-06-23 21:23 ` [Tarantool-patches] [PATCH 0/2] Extend feedback module report Vladislav Shpilevoy
2020-07-13 13:47 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=D0386F8C-09C6-47EB-BA98-4CA663BE4936@gmail.com \
    --to=runsfor@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 2/2] feedback: collect db engines and index features' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox