Skip to content

Commit 436218d

Browse files
author
Konstantin Belyavskiy
committed
move unit tests to unit
1 parent ea9d082 commit 436218d

11 files changed

+7
-5
lines changed

Diff for: Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
.PHONY: test
12
test:
2-
python -m pytest
3+
python setup.py test
4+
cd test && ./test-run.py
35
coverage:
46
python -m coverage run -p --source=. setup.py test
57
cov-html:

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# Test runner
4040
# python setup.py test
4141
try:
42-
from tests.setup_command import test
42+
from unit.setup_command import test
4343
cmdclass["test"] = test
4444
except ImportError:
4545
pass

Diff for: tests/__init__.py renamed to unit/__init__.py

File renamed without changes.

Diff for: tests/setup_command.py renamed to unit/setup_command.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ def run(self):
2222
Find all tests in test/tarantool/ and run them
2323
'''
2424

25-
tests = unittest.defaultTestLoader.discover('tests')
25+
tests = unittest.defaultTestLoader.discover('unit')
2626
test_runner = unittest.TextTestRunner(verbosity = 2)
2727
test_runner.run(tests)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: tests/suites/test_dml.py renamed to unit/suites/test_dml.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def setUpClass(self):
1111
print(' DML '.center(70, '='))
1212
print('-' * 70)
1313
self.srv = TarantoolServer()
14-
self.srv.script = 'tests/suites/box.lua'
14+
self.srv.script = 'unit/suites/box.lua'
1515
self.srv.start()
1616
self.con = tarantool.Connection('localhost', self.srv.args['primary'])
1717
self.adm = self.srv.admin
File renamed without changes.

Diff for: tests/suites/test_schema.py renamed to unit/suites/test_schema.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def setUpClass(self):
1010
print(' SCHEMA '.center(70, '='))
1111
print('-' * 70)
1212
self.srv = TarantoolServer()
13-
self.srv.script = 'tests/suites/box.lua'
13+
self.srv.script = 'unit/suites/box.lua'
1414
self.srv.start()
1515
self.con = tarantool.Connection('localhost', self.srv.args['primary'])
1616
self.sch = self.con.schema

0 commit comments

Comments
 (0)