Merge remote branch 'origin/master-stable'
Conflicts: test/CMakeLists.txt test/lib/tarantool_box_server.py test/lib/test_suite.py test/test-run.py
Showing
- test/CMakeLists.txt 1 addition, 1 deletiontest/CMakeLists.txt
- test/box/args.test 3 additions, 0 deletionstest/box/args.test
- test/box/bug726778.cfg 2 additions, 0 deletionstest/box/bug726778.cfg
- test/box/configuration.test 4 additions, 11 deletionstest/box/configuration.test
- test/box/reconfigure.test 12 additions, 43 deletionstest/box/reconfigure.test
- test/box/show.test 3 additions, 3 deletionstest/box/show.test
- test/box/snapshot.result 1 addition, 1 deletiontest/box/snapshot.result
- test/box/snapshot.test 7 additions, 5 deletionstest/box/snapshot.test
- test/box/tarantool_bug708685.cfg 2 additions, 0 deletionstest/box/tarantool_bug708685.cfg
- test/box/xlog.test 17 additions, 17 deletionstest/box/xlog.test
- test/box_big/suite.ini 1 addition, 1 deletiontest/box_big/suite.ini
- test/lib/box.py 61 additions, 0 deletionstest/lib/box.py
- test/lib/server.py 238 additions, 0 deletionstest/lib/server.py
- test/lib/tarantool_admin.py 50 additions, 0 deletionstest/lib/tarantool_admin.py
- test/lib/tarantool_box_server.py 29 additions, 230 deletionstest/lib/tarantool_box_server.py
- test/lib/tarantool_connection.py 8 additions, 68 deletionstest/lib/tarantool_connection.py
- test/lib/tarantool_feeder_server.py 17 additions, 0 deletionstest/lib/tarantool_feeder_server.py
- test/lib/tarantool_server.py 81 additions, 0 deletionstest/lib/tarantool_server.py
- test/lib/test_suite.py 33 additions, 75 deletionstest/lib/test_suite.py
- test/test-run.py 29 additions, 18 deletionstest/test-run.py
Loading
Please register or sign in to comment