From 29a4ffc57ac45e869980c49c85b78488070c298d Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Tue, 2 Sep 2014 19:16:34 +0400
Subject: [PATCH] Fixing sequential running of multiple hot_standby tests
---
test/lib/preprocessor.py | 7 ++++---
test/replication/hot_standby.result | 4 +---
test/replication/hot_standby.test.lua | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/test/lib/preprocessor.py b/test/lib/preprocessor.py
index ca979a41b9..8f536568d0 100644
--- a/test/lib/preprocessor.py
+++ b/test/lib/preprocessor.py
@@ -24,7 +24,7 @@ class TestState(object):
self.delimiter = ''
self.suite_ini = suite_ini
self.environ = Namespace()
- self.create_server = create_server
+ self.create_server = create_server
self.servers = { 'default': default_server }
self.connections = { 'default': default_server.admin }
# curcon is an array since we may have many connections
@@ -164,12 +164,13 @@ class TestState(object):
self.connections.pop(sname)
self.servers[sname].stop()
elif ctype == 'deploy':
- pass
+ self.servers[sname].deploy()
elif ctype == 'cleanup':
if sname not in self.servers:
raise LuaPreprocessorException('Can\'t cleanup nonexistent server '+repr(sname))
self.servers[sname].cleanup()
- delattr(self.environ, sname)
+ if sname != 'default':
+ delattr(self.environ, sname)
else:
raise LuaPreprocessorException('Unknown command for server: '+repr(ctype))
diff --git a/test/replication/hot_standby.result b/test/replication/hot_standby.result
index db5c16770d..65676c970e 100644
--- a/test/replication/hot_standby.result
+++ b/test/replication/hot_standby.result
@@ -190,8 +190,6 @@ _select(11, 20)
--# stop server replica
--# cleanup server hot_standby
--# cleanup server replica
+--# deploy server default
--# start server default
--# set connection default
-box.space['tweedledum']:drop()
----
-...
diff --git a/test/replication/hot_standby.test.lua b/test/replication/hot_standby.test.lua
index 8acb7ebdff..e52f915b86 100644
--- a/test/replication/hot_standby.test.lua
+++ b/test/replication/hot_standby.test.lua
@@ -94,6 +94,6 @@ _select(11, 20)
--# stop server replica
--# cleanup server hot_standby
--# cleanup server replica
+--# deploy server default
--# start server default
--# set connection default
-box.space['tweedledum']:drop()
--
GitLab