Merge branch 'tt-merge-servers'

184208da · Konstantin Osipov · 47155fdc · 8a7ce945 · 184208da · 184208da
Commit 184208da authored 11 years ago by Konstantin Osipov
--- a/test/replication/hot_standby.test
+++ b/test/replication/hot_standby.test
--- a/test/replication/memcached.test
+++ b/test/replication/memcached.test
--- a/test/replication/suite.ini
+++ b/test/replication/suite.ini
 [default]
-core = python tarantool
+core = tarantool
 description = tarantool/box, replication
 config = cfg/master.cfg
-# put disabled in valgrind test here
-#valgrind_disabled = ...
--- a/test/replication/swap.test
+++ b/test/replication/swap.test
--- a/test/wal/lua.test
+++ b/test/wal/lua.test
--- a/test/wal/oom.test
+++ b/test/wal/oom.test
--- a/test/wal/suite.ini
+++ b/test/wal/suite.ini
 [default]
-core = python tarantool
+core = tarantool
 description = tarantool/box, wal_mode = none
 config = tarantool.cfg
 # put disabled tests here

--- a/test/wal/wal_mode.test
+++ b/test/wal/wal_mode.test