Skip to content

Commit c88e15d

Browse files
committed
skip master-replica tests if popen is not supported
Since version 2.4.1, Tarantool has the popen built-in module that supports execution of external programs. popen() uses in tests for creating replica instance.
1 parent 126211c commit c88e15d

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

t/200-master-replica.t

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env tarantool
22

33
local fio = require('fio')
4+
local log = require('log')
45
local tnt = require('t.tnt')
56
local test = require('tap').test('')
67
local uuid = require('uuid')
@@ -10,6 +11,12 @@ local fiber = require('fiber')
1011
local queue_state = require('queue.abstract.queue_state')
1112
rawset(_G, 'queue', require('queue'))
1213

14+
local qc = require('queue.compat')
15+
if not qc.check_version({2, 4, 1}) then
16+
log.info('Tests skipped, tarantool version < 2.4.1')
17+
return
18+
end
19+
1320
test:plan(12)
1421

1522
local engine = os.getenv('ENGINE') or 'memtx'

t/tnt/init.lua

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ local log = require('log')
33
local yaml = require('yaml')
44
local errno = require('errno')
55
local fiber = require('fiber')
6-
local popen = require('popen')
76
local netbox = require('net.box')
87

98
local dir = os.getenv('QUEUE_TMP')
@@ -46,6 +45,11 @@ local function tnt_prepare(cfg_args)
4645
end
4746

4847
local function tnt_cluster_prepare(cfg_args)
48+
if not qc.check_version({2, 4, 1}) then
49+
error('this test requires tarantool >= 2.4.1')
50+
return false
51+
end
52+
4953
-- prepare master
5054
cfg_args = cfg_args or {}
5155
local files = fio.glob(fio.pathjoin(dir, '*'))
@@ -101,7 +105,7 @@ local function tnt_cluster_prepare(cfg_args)
101105
'}'
102106
}
103107

104-
replica = popen.new(cmd_replica, {
108+
replica = require('popen').new(cmd_replica, {
105109
stdin = 'devnull',
106110
stdout = 'devnull',
107111
stderr = 'devnull',
@@ -173,7 +177,6 @@ return {
173177
for _, file in pairs(files) do
174178
log.info("remove %s", file)
175179
fio.unlink(file)
176-
print("clean replica " .. file)
177180
end
178181
end
179182
if replica then

0 commit comments

Comments
 (0)