diff --git a/README.rst b/README.rst index 57c8d33c..3b5af060 100644 --- a/README.rst +++ b/README.rst @@ -97,7 +97,7 @@ On Linux: On Windows: * Setup a Linux machine with installed tarantool (called ``remote`` later). -* (on ``remote``) Copy ``unit/suites/lib/tarantool_python_ci.lua`` to +* (on ``remote``) Copy ``test/suites/lib/tarantool_python_ci.lua`` to ``/etc/tarantool/instances.available``. * (on ``remote``) Run ``tarantoolctl start tarantool_python_ci``. * Set the following environment variables: diff --git a/setup.py b/setup.py index c17634f6..2f4746f0 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ # Test runner # python setup.py test try: - from unit.setup_command import test + from test.setup_command import test cmdclass["test"] = test except ImportError: pass diff --git a/unit/__init__.py b/test/__init__.py similarity index 100% rename from unit/__init__.py rename to test/__init__.py diff --git a/unit/setup_command.py b/test/setup_command.py similarity index 86% rename from unit/setup_command.py rename to test/setup_command.py index 65e6f780..1711e2d1 100755 --- a/unit/setup_command.py +++ b/test/setup_command.py @@ -10,7 +10,7 @@ class test(setuptools.Command): user_options = [] - description = 'Run unit tests' + description = 'Run tests' def initialize_options(self): pass @@ -23,7 +23,7 @@ def run(self): Find all tests in test/tarantool/ and run them ''' - tests = unittest.defaultTestLoader.discover('unit', pattern='suites') + tests = unittest.defaultTestLoader.discover('test', pattern='suites') test_runner = unittest.TextTestRunner(verbosity=2) result = test_runner.run(tests) if not result.wasSuccessful(): diff --git a/unit/suites/__init__.py b/test/suites/__init__.py similarity index 100% rename from unit/suites/__init__.py rename to test/suites/__init__.py diff --git a/unit/suites/box.lua b/test/suites/box.lua similarity index 100% rename from unit/suites/box.lua rename to test/suites/box.lua diff --git a/unit/suites/lib/__init__.py b/test/suites/lib/__init__.py similarity index 100% rename from unit/suites/lib/__init__.py rename to test/suites/lib/__init__.py diff --git a/unit/suites/lib/remote_tarantool_server.py b/test/suites/lib/remote_tarantool_server.py similarity index 100% rename from unit/suites/lib/remote_tarantool_server.py rename to test/suites/lib/remote_tarantool_server.py diff --git a/unit/suites/lib/tarantool_admin.py b/test/suites/lib/tarantool_admin.py similarity index 100% rename from unit/suites/lib/tarantool_admin.py rename to test/suites/lib/tarantool_admin.py diff --git a/unit/suites/lib/tarantool_python_ci.lua b/test/suites/lib/tarantool_python_ci.lua similarity index 100% rename from unit/suites/lib/tarantool_python_ci.lua rename to test/suites/lib/tarantool_python_ci.lua diff --git a/unit/suites/lib/tarantool_server.py b/test/suites/lib/tarantool_server.py similarity index 100% rename from unit/suites/lib/tarantool_server.py rename to test/suites/lib/tarantool_server.py diff --git a/unit/suites/test_dbapi.py b/test/suites/test_dbapi.py similarity index 98% rename from unit/suites/test_dbapi.py rename to test/suites/test_dbapi.py index 39672b5d..074620f1 100644 --- a/unit/suites/test_dbapi.py +++ b/test/suites/test_dbapi.py @@ -26,7 +26,7 @@ def setUpClass(self): print(' DBAPI '.center(70, '='), file=sys.stderr) print('-' * 70, file=sys.stderr) self.srv = TarantoolServer() - self.srv.script = 'unit/suites/box.lua' + self.srv.script = 'test/suites/box.lua' self.srv.start() self.con = tarantool.Connection(self.srv.host, self.srv.args['primary']) self.driver = dbapi diff --git a/unit/suites/test_dml.py b/test/suites/test_dml.py similarity index 99% rename from unit/suites/test_dml.py rename to test/suites/test_dml.py index 31e821ea..e3922a10 100644 --- a/unit/suites/test_dml.py +++ b/test/suites/test_dml.py @@ -14,7 +14,7 @@ def setUpClass(self): print(' DML '.center(70, '='), file=sys.stderr) print('-' * 70, file=sys.stderr) self.srv = TarantoolServer() - self.srv.script = 'unit/suites/box.lua' + self.srv.script = 'test/suites/box.lua' self.srv.start() self.con = tarantool.Connection(self.srv.host, self.srv.args['primary']) self.adm = self.srv.admin diff --git a/unit/suites/test_execute.py b/test/suites/test_execute.py similarity index 98% rename from unit/suites/test_execute.py rename to test/suites/test_execute.py index 21b8cfac..e10c0073 100644 --- a/unit/suites/test_execute.py +++ b/test/suites/test_execute.py @@ -26,7 +26,7 @@ def setUpClass(self): print(' EXECUTE '.center(70, '='), file=sys.stderr) print('-' * 70, file=sys.stderr) self.srv = TarantoolServer() - self.srv.script = 'unit/suites/box.lua' + self.srv.script = 'test/suites/box.lua' self.srv.start() self.con = tarantool.Connection(self.srv.host, self.srv.args['primary']) diff --git a/unit/suites/test_mesh.py b/test/suites/test_mesh.py similarity index 99% rename from unit/suites/test_mesh.py rename to test/suites/test_mesh.py index cb613674..df0b059a 100644 --- a/unit/suites/test_mesh.py +++ b/test/suites/test_mesh.py @@ -18,7 +18,7 @@ def create_server(_id): srv = TarantoolServer() - srv.script = 'unit/suites/box.lua' + srv.script = 'test/suites/box.lua' srv.start() srv.admin("box.schema.user.create('test', {password = 'test', " + "if_not_exists = true})") diff --git a/unit/suites/test_protocol.py b/test/suites/test_protocol.py similarity index 100% rename from unit/suites/test_protocol.py rename to test/suites/test_protocol.py diff --git a/unit/suites/test_reconnect.py b/test/suites/test_reconnect.py similarity index 98% rename from unit/suites/test_reconnect.py rename to test/suites/test_reconnect.py index 24470bae..403fd351 100644 --- a/unit/suites/test_reconnect.py +++ b/test/suites/test_reconnect.py @@ -15,7 +15,7 @@ def setUpClass(self): print(' RECONNECT '.center(70, '='), file=sys.stderr) print('-' * 70, file=sys.stderr) self.srv = TarantoolServer() - self.srv.script = 'unit/suites/box.lua' + self.srv.script = 'test/suites/box.lua' def setUp(self): # prevent a remote tarantool from clean our session diff --git a/unit/suites/test_schema.py b/test/suites/test_schema.py similarity index 99% rename from unit/suites/test_schema.py rename to test/suites/test_schema.py index 37850e06..c5f12282 100644 --- a/unit/suites/test_schema.py +++ b/test/suites/test_schema.py @@ -43,7 +43,7 @@ def setUpClass(self): print(' SCHEMA ({}) '.format(params).center(70, '='), file=sys.stderr) print('-' * 70, file=sys.stderr) self.srv = TarantoolServer() - self.srv.script = 'unit/suites/box.lua' + self.srv.script = 'test/suites/box.lua' self.srv.start() self.con = tarantool.Connection(self.srv.host, self.srv.args['primary'], encoding=self.encoding)