From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 44F744C885; Thu, 14 Jan 2021 12:46:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 44F744C885 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1610617607; bh=451lY6ZlGdphbHQxWoebcHPbo9iWaJMlHgMGJ4dJAyc=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=QJDQBDKQJp5IO0ULDCVvcDiFiyeBkdrICQhjeNak7atd728/QjJ0jCFFcgOZqT7H6 wfKolD2AHNIfZcwqVmrHOhD5PVPSIGWGSgvBCAPsnwF6zfV6lFrh+CDj33iESp8KIP 9wyaEhLy/ENMOeQ2KasDrC2bCQOjaI2i3L9eQQz0= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 76C1C4C885 for ; Thu, 14 Jan 2021 12:45:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 76C1C4C885 Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1kzzCN-0006ZM-FV; Thu, 14 Jan 2021 12:45:47 +0300 To: Alexander Turenko Date: Thu, 14 Jan 2021 12:45:40 +0300 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D0E79FBC973162CD81CC0669AF3BE2AC14A0BAA29BC1501600894C459B0CD1B9D4EDB0000F4F163553A3B4728B37DAA45D3D06EE51972959AE9C07854FFBA0A0 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B8498AC83B273C12EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375A514678F9DF65078638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC20F4D7051A806318A760AA482711A88A091197399D385A9C389733CBF5DBD5E913377AFFFEAFD269A417C69337E82CC2CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C07E7E81EEA8A9722B8941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD2690E30A4C9C8E338DABE60A39C19F270AE7B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050FD58E677C372A3F47D7C2347B1D03E769B3661434B16C20AC78D18283394535A975ECD9A6C639B01BC09775C1D3CA48CF365DBFF11B6477C535872C767BF85DA22EF20D2F80756B5F40A5AABA2AD3711975ECD9A6C639B01B78DA827A17800CE779F3DAAAE5386702731C566533BA786A40A5AABA2AD371193C9F3DD0FB1AF5EB82E77451A5C57BD33C9F3DD0FB1AF5EB4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD9CBB3A052EDBDE51FFDEA9ED46B4783857449BC875D4E399C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF6EA1BA7CA28B4A74699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349C39CCCDAABCB54B37EFD0881006B3161602643D4F5086E118E35B088228DBD9B583A60BC850A1FC1D7E09C32AA3244CCB1D5D53D2626326947D2A28FF05DCBBF2F5F14F68F1805B83B48618A63566E0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj9kdO2HH36x6VUFKgr6WFIA== X-Mailru-Sender: 65CD03CFE33A0EC7A4D6F6B2DF798FE6F00D8C047C8F0A4288AD90A55B066A25346F7039F6561F5CB08A37556DE0CB7BB7E364AFDB3F206FD953F29DB7D76D89B1E6F68DAE724AB9112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCHv3 2/2] test: move helper functions to separated module in -e assert(false) test X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Artem Starshov via Tarantool-patches Reply-To: Artem Starshov Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Functions with timeout transferred to module test/app-tap/lua/process_timeout.lua for further using in other tests. Before this version of test was already done, but by mistake older version was rebased on master. Follows up #4983 --- from https://lists.tarantool.org/pipermail/tarantool-patches/2020-December/021895.html : "2) No external function currently uses this function. I suggest removing it from the interface." I'd like to leave `process_is_alive`, because it's really useful function, it's already needed in `-e enters interactive mode` test. .../gh-4983-tnt-e-assert-false-hangs.test.lua | 62 +++---------------- test/app-tap/lua/process_timeout.lua | 57 +++++++++++++++++ test/app-tap/suite.ini | 2 +- 3 files changed, 67 insertions(+), 54 deletions(-) create mode 100644 test/app-tap/lua/process_timeout.lua diff --git a/test/app-tap/gh-4983-tnt-e-assert-false-hangs.test.lua b/test/app-tap/gh-4983-tnt-e-assert-false-hangs.test.lua index d259f37fd..2978a6203 100755 --- a/test/app-tap/gh-4983-tnt-e-assert-false-hangs.test.lua +++ b/test/app-tap/gh-4983-tnt-e-assert-false-hangs.test.lua @@ -1,61 +1,17 @@ #!/usr/bin/env tarantool -local fiber = require('fiber') -local clock = require('clock') -local ffi = require('ffi') -local fio = require('fio') -local errno = require('errno') +-- Using io.popen and self written module process_timeout +-- in presence of the 'popen' built-in module because the +-- last one isn't available in 1.10 +local process_timeout = require('process_timeout') local tap = require('tap') +local fio = require('fio') +local ffi = require('ffi') -- -- gh-4983: tarantool -e 'assert(false)' hangs -- --- For process_is_alive. -ffi.cdef([[ - int kill(pid_t pid, int sig); -]]) - ---- Verify whether a process is alive. -local function process_is_alive(pid) - local rc = ffi.C.kill(pid, 0) - return rc == 0 or errno() ~= errno.ESRCH -end - ---- Returns true if process completed before timeout, false otherwise. -local function wait_process_completion(pid, timeout) - local start_time = clock.monotonic() - local process_completed = false - while clock.monotonic() - start_time < timeout do - if not process_is_alive(pid) then - process_completed = true - break - end - end - return process_completed -end - ---- Open file on reading with timeout. -local function open_with_timeout(filename, timeout) - local fh - local start_time = clock.monotonic() - while not fh and clock.monotonic() - start_time < timeout do - fh = fio.open(filename, {'O_RDONLY'}) - end - return fh -end - ---- Try to read from file with timeout with interval. -local function read_with_timeout(fh, timeout, interval) - local data = '' - local start_time = clock.monotonic() - while #data == 0 and clock.monotonic() - start_time < timeout do - data = fh:read() - if #data == 0 then fiber.sleep(interval) end - end - return data -end - local TARANTOOL_PATH = arg[-1] local output_file = fio.abspath('out.txt') local line = ('%s -e "assert(false)" > %s 2>&1 & echo $!'): @@ -73,7 +29,7 @@ local res = tap.test('gh-4983-tnt-e-assert-false-hangs', function(test) local pid = tonumber(io.popen(line):read('*line')) assert(pid, 'pid of proccess can\'t be recieved') - local process_completed = wait_process_completion(pid, + local process_completed = process_timeout.wait_process_completion(pid, process_waiting_timeout) test:ok(process_completed, @@ -82,10 +38,10 @@ local res = tap.test('gh-4983-tnt-e-assert-false-hangs', function(test) -- Kill process if hangs. if not process_completed then ffi.C.kill(pid, 9) end - local fh = open_with_timeout(output_file, file_open_timeout) + local fh = process_timeout.open_with_timeout(output_file, file_open_timeout) assert(fh, 'error while opening ' .. output_file) - local data = read_with_timeout(fh, file_read_timeout, file_read_interval) + local data = process_timeout.read_with_timeout(fh, file_read_timeout, file_read_interval) test:like(data, 'assertion failed', 'assertion failure is displayed') fh:close() diff --git a/test/app-tap/lua/process_timeout.lua b/test/app-tap/lua/process_timeout.lua new file mode 100644 index 000000000..141fb0e43 --- /dev/null +++ b/test/app-tap/lua/process_timeout.lua @@ -0,0 +1,57 @@ +local fiber = require('fiber') +local clock = require('clock') +local ffi = require('ffi') +local fio = require('fio') +local errno = require('errno') + +-- For process_is_alive. +ffi.cdef([[ + int kill(pid_t pid, int sig); +]]) + +--- Verify whether a process is alive. +local function process_is_alive(pid) + local rc = ffi.C.kill(pid, 0) + return rc == 0 or errno() ~= errno.ESRCH +end + +--- Returns true if process completed before timeout, false otherwise. +local function wait_process_completion(pid, timeout) + local start_time = clock.monotonic() + local process_completed = false + while clock.monotonic() - start_time < timeout do + if not process_is_alive(pid) then + process_completed = true + break + end + end + return process_completed +end + +--- Open file on reading with timeout. +local function open_with_timeout(filename, timeout) + local fh + local start_time = clock.monotonic() + while not fh and clock.monotonic() - start_time < timeout do + fh = fio.open(filename, {'O_RDONLY'}) + end + return fh +end + +--- Try to read from file with timeout with interval. +local function read_with_timeout(fh, timeout, interval) + local data = '' + local start_time = clock.monotonic() + while #data == 0 and clock.monotonic() - start_time < timeout do + data = fh:read() + if #data == 0 then fiber.sleep(interval) end + end + return data +end + +return { + process_is_alive = process_is_alive, + wait_process_completion = wait_process_completion, + open_with_timeout = open_with_timeout, + read_with_timeout = read_with_timeout +} diff --git a/test/app-tap/suite.ini b/test/app-tap/suite.ini index 2f16128f9..6e27f88d6 100644 --- a/test/app-tap/suite.ini +++ b/test/app-tap/suite.ini @@ -1,7 +1,7 @@ [default] core = app description = application server tests (TAP) -lua_libs = lua/require_mod.lua lua/serializer_test.lua +lua_libs = lua/require_mod.lua lua/serializer_test.lua lua/process_timeout.lua is_parallel = True pretest_clean = True use_unix_sockets_iproto = True -- 2.28.0