ci: bump test-run

In the near future we plan to test Tarantool installed from a DEB/RPM package. Since 3.0.0-alpha1 release Tarantool packages don't have the tarantoolctl utility inside. tarantoolctl was ebmed to the test-run project inself. The submodule has been updated to the latest version. Part of tarantool/tarantool#9443
tarantool · Jan 24, 2024 · 2f8427a · 2f8427a
1 parent 8dcf656
commit 2f8427a
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 59 deletions.
diff --git a/test-run b/test-run
diff --git a/test/binary/binary-boundary.test.py b/test/binary/binary-boundary.test.py
@@ -8,11 +8,11 @@
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
 from internal.memcached_connection import MemcachedBinaryConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
 from internal.compat import string_types
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 
 def iequal(left, right, level = 1):
     if (left != right):

diff --git a/test/binary/binary-expire.test.py b/test/binary/binary-expire.test.py
@@ -8,9 +8,9 @@
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
 from internal.memcached_connection import MemcachedBinaryConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 
 def iequal(left, right, level = 1):
     if (left != right):

diff --git a/test/binary/binary-gh-73.test.py b/test/binary/binary-gh-73.test.py
@@ -6,9 +6,9 @@
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
 from internal.memcached_connection import MemcachedBinaryConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 
 batch_count = 20 # Default batch_count value used in memcached.
 

diff --git a/test/binary/binary-toobig.test.py b/test/binary/binary-toobig.test.py
@@ -7,9 +7,9 @@
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
 from internal.memcached_connection import MemcachedBinaryConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 
 def iequal(left, right, level = 1):
     if (left != right):

diff --git a/test/binary/binary.lua b/test/binary/binary.lua
@@ -8,7 +8,7 @@ box.cfg{
 package.cpath = './?.so;' .. package.cpath
 
 require('memcached').create('memcached',
-    os.getenv('LISTEN'):match(':(.*)'), {
+    "20509", {
         expire_full_scan_time = 1,
 })
 

diff --git a/test/binary/binary.test.py b/test/binary/binary.test.py
@@ -7,9 +7,9 @@
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
 from internal.memcached_connection import MemcachedBinaryConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 
 def iequal(left, right, level = 1):
     if (left != right):

diff --git a/test/capable/capable-binary.test.py b/test/capable/capable-binary.test.py
@@ -10,11 +10,11 @@
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
 from internal.memcached_connection import MemcachedBinaryConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
 from internal.compat import bytes_to_str
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 mc.flush()
 
 cmd = shlex.split('capable/memcapable -b -p %s -h %s -v' %

diff --git a/test/capable/capable-text.test.py b/test/capable/capable-text.test.py
@@ -10,11 +10,11 @@
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
 from internal.memcached_connection import MemcachedBinaryConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
 from internal.compat import bytes_to_str
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 mc.flush()
 
 cmd = shlex.split('capable/memcapable -a -p %s -h %s -v' %

diff --git a/test/internal/memcached_connection.py b/test/internal/memcached_connection.py
@@ -61,6 +61,8 @@
     'sasl_step'  : [0x22, Struct(HEADER + ''),    0,  None, 0   ],
 }
 
+CONNECT_PORT = "20509"
+
 def is_indecrq(cmd):
     if cmd in (COMMANDS['incr'][0], COMMANDS['decr'][0], COMMANDS['incrq'][0],
             COMMANDS['decrq'][0]):

diff --git a/test/sasl/binary-sasl.test.py b/test/sasl/binary-sasl.test.py
@@ -8,9 +8,9 @@
 
 from internal.memcached_connection import MemcachedBinaryConnection
 from internal.memcached_connection import MemcachedTextConnection
-from internal.memcached_connection import STATUS, COMMANDS
+from internal.memcached_connection import STATUS, COMMANDS, CONNECT_PORT
 
-mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+mc = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
 
 def iequal(left, right, level = 1):
     if (left != right):
@@ -59,22 +59,22 @@ def delete(key, when):
 print("""#---------------------------# sasl tests #--------------------------#""")
 
 if True:
-    mc1 = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+    mc1 = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
     res = mc1.set('x', 'somevalue')
     iequal(res[0]['status'], STATUS['AUTH_ERROR'])
 
 if True:
-    mc1 = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+    mc1 = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
     res = mc1.delete('x', 'somevalue')
     iequal(res[0]['status'], STATUS['AUTH_ERROR'])
 
 if True:
-    mc1 = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+    mc1 = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
     res = mc1.set('x', 'somevalue')
     iequal(res[0]['status'], STATUS['AUTH_ERROR'])
 
 if True:
-    mc1 = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+    mc1 = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
     res = mc1.flush()
     iequal(res[0]['status'], STATUS['AUTH_ERROR'])
 
@@ -117,7 +117,7 @@ def delete(key, when):
     empty('x')
 
 if True:
-    mc1 = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+    mc1 = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
     secret = '%c%s%c%s' % (0, 'testuser', 0, 'wrongpass')
     res = mc1.sasl_start('PLAIN', secret)
     iequal(res[0]['status'], STATUS['AUTH_ERROR'])
@@ -126,12 +126,12 @@ def delete(key, when):
     iequal(res[0]['status'], STATUS['AUTH_ERROR'])
 
 if True:
-    mc1 = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+    mc1 = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
     secret = '%c%s%c%s' % (0, 'testuser', 0, 'wrongpass')
     res = mc1.sasl_start('PLAIN', secret)
     iequal(res[0]['status'], STATUS['AUTH_ERROR'])
 
-    mc2 = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port)
+    mc2 = MemcachedBinaryConnection("127.0.0.1", CONNECT_PORT)
     secret = '%c%s%c%s' % (0, 'testuser', 0, 'testpass')
     res = mc2.sasl_start('PLAIN', secret)
     iequal(res[0]['status'], 0)

diff --git a/test/text/binary-get.test.py b/test/text/binary-get.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 blobs_list = [ "mooo\0", "mumble\0\0\0\0\r\rblarg", "\0", "\r" ]
 

diff --git a/test/text/bogus-commands.test.py b/test/text/bogus-commands.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 mc_client("boguscommand slkdsldkfjsd\r\n")
 

diff --git a/test/text/cas.test.py b/test/text/cas.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 mc_client("cas bad blah 0 0 0\r\n")
 mc_client("cas bad 0 blah 0 0\r\n")
@@ -73,7 +72,7 @@
     print("fail: foo1_cas == foo2_cas")
 
 memcached1 = mc_client
-memcached2 = MemcachedTextConnection('localhost', port)
+memcached2 = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 print("""# gets foo from memcached1 - should success """)
 result = memcached1("gets foo1\r\n", silent = True)

diff --git a/test/text/expirations.test.py b/test/text/expirations.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 master_id = server.get_param('server')['id']
 

diff --git a/test/text/flags.test.py b/test/text/flags.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 flags_list = [0x0, 0x7b, 0xffff]
 

diff --git a/test/text/flush-all.test.py b/test/text/flush-all.test.py
@@ -8,10 +8,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 ###################################
 def get_memcached_len(serv):

diff --git a/test/text/getset.test.py b/test/text/getset.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 mc_client("flush_all\r\n", silent = True)
 

diff --git a/test/text/incrdecr.test.py b/test/text/incrdecr.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 print("""# incr/decr big value """)
 mc_client("set bug21 0 0 19\r\n9223372036854775807\r\n")

diff --git a/test/text/multiversioning.test.py b/test/text/multiversioning.test.py
@@ -7,17 +7,16 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 buf_size = 256 * 1024
 buf = "0123456789abcdef" * int(buf_size / 16)
 buf_upper = buf.upper()
 
 memcached1 = mc_client
-memcached2 = MemcachedTextConnection('localhost', port)
+memcached2 = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 print("""# Store big in lower case via first memcached client """)
 print("set big 0 0 %d\r\n<big-value-lower-case>" % buf_size)

diff --git a/test/text/noreply.test.py b/test/text/noreply.test.py
@@ -7,10 +7,9 @@
 saved_path = sys.path[:]
 sys.path.append(os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda:0))))
 
-from internal.memcached_connection import MemcachedTextConnection
+from internal.memcached_connection import MemcachedTextConnection, CONNECT_PORT
 
-port = int(iproto.uri.split(':')[1])
-mc_client = MemcachedTextConnection('localhost', port)
+mc_client = MemcachedTextConnection('localhost', CONNECT_PORT)
 
 print("""# Test that commands can take 'noreply' parameter. """)
 mc_client("flush_all noreply\r\n")

diff --git a/test/text/text.lua b/test/text/text.lua
@@ -8,11 +8,11 @@ box.cfg{
 package.cpath = './?.so;' .. package.cpath
 
 require('memcached').create('memcached',
-    os.getenv('LISTEN'):match(':(.*)'), {
+    "20509", {
         expire_full_scan_time = 1
 })
 
--- require('log').info(os.getenv('LISTEN'):match(':(.*)'))
+require('log').info(os.getenv('LISTEN'):match(':(.*)'))
 
 require('console').listen(os.getenv('ADMIN'))
+18 −25		.github/workflows/test.yml
+1 −0		.gitignore
+1 −1		.luacheckrc
+1 −1		Makefile
+30 −2		README.md
+7 −42		dispatcher.py
+15 −5		lib/__init__.py
+5 −1		lib/admin_connection.py
+23 −18		lib/app_server.py
+6 −0		lib/box_connection.py
+23 −0		lib/colorer.py
+0 −5		lib/inspector.py
+1 −1		lib/luatest
+49 −24		lib/luatest_server.py
+299 −81		lib/options.py
+8 −6		lib/preprocessor.py
+24 −10		lib/server.py
+1 −7		lib/server_mixins.py
+177 −61		lib/tarantool_server.py
+18 −9		lib/test.py
+9 −14		lib/test_suite.py
+2 −2		lib/unittest_server.py
+21 −59		lib/utils.py
+69 −30		lib/worker.py
+103 −51		listeners.py
+1 −1		requirements-test.txt
+2 −1		requirements.txt
+1,353 −0		tarantoolctl
+47 −9		test-run.py
+35 −10		test/instances/default.lua
+0 −44		test/luatest_helpers.lua
+9 −5		test/luatest_helpers/server.lua
+0 −1		test/test-app/suite.ini
+14 −11		test/test-luatest/smoke_check_test.lua
+1 −2		test/test-tarantool/call.result
+2 −0		test/test-tarantool/call.test.py
+0 −1		test/test-tarantool/suite.ini
+7 −0		test/unittest/box-cc0544b6afd1.lua
+0 −0		test/unittest/hang.result
+6 −0		test/unittest/hang.test.lua
+8 −0		test/unittest/replica-7f4d4895ff58.lua
+5 −0		test/unittest/suite.ini
+1 −19		test/unittest/test_lib_utils.py
+47 −0		test/unittest/test_tarantool_server.py
+7 −2		test_run.lua