Fixing sequential running of multiple hot_standby tests

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))
 

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()
----
-...

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()