[Tarantool-patches] [PATCH 2/2] feedback: collect db engines and index features

Илья Конюхов runsfor at gmail.com
Mon Jun 22 11:55:34 MSK 2020


Hi,

I’ve removed unrelated hunk, thanks for noticing.

> On 20 Jun 2020, at 02:49, Vladislav Shpilevoy <v.shpilevoy at 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()



More information about the Tarantool-patches mailing list