File tree Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env tarantool
2
2
3
3
local fio = require (' fio' )
4
+ local log = require (' log' )
4
5
local tnt = require (' t.tnt' )
5
6
local test = require (' tap' ).test (' ' )
6
7
local uuid = require (' uuid' )
@@ -10,6 +11,12 @@ local fiber = require('fiber')
10
11
local queue_state = require (' queue.abstract.queue_state' )
11
12
rawset (_G , ' queue' , require (' queue' ))
12
13
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
+
13
20
-- Replica connection handler
14
21
local conn = {}
15
22
Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ local log = require('log')
3
3
local yaml = require (' yaml' )
4
4
local errno = require (' errno' )
5
5
local fiber = require (' fiber' )
6
- local popen = require (' popen' )
7
6
local netbox = require (' net.box' )
8
7
9
8
local dir = os.getenv (' QUEUE_TMP' )
55
54
56
55
-- Creates master and replica setup for queue states switching tests.
57
56
local function tnt_cluster_prepare (cfg_args )
57
+ -- Since version 2.4.1, Tarantool has the popen built-in module
58
+ -- that supports execution of external programs.
59
+ if not qc .check_version ({2 , 4 , 1 }) then
60
+ error (' this test requires tarantool >= 2.4.1' )
61
+ return false
62
+ end
63
+
58
64
-- Prepare master.
59
65
cfg_args = cfg_args or {}
60
66
local files = fio .glob (fio .pathjoin (dir , ' *' ))
@@ -111,7 +117,7 @@ local function tnt_cluster_prepare(cfg_args)
111
117
' }'
112
118
}
113
119
114
- replica = popen .new (cmd_replica , {
120
+ replica = require ( ' popen' ) .new (cmd_replica , {
115
121
stdin = ' devnull' ,
116
122
stdout = ' devnull' ,
117
123
stderr = ' devnull' ,
You can’t perform that action at this time.
0 commit comments