Commit 01bb0bf8 authored by Kirill Smelkov's avatar Kirill Smelkov

.

(fix syntax error there)
parent 096550b1
...@@ -128,7 +128,7 @@ class ReplicationTests(NEOThreadedTest): ...@@ -128,7 +128,7 @@ class ReplicationTests(NEOThreadedTest):
self.assertEqual(np*nr, self.checkBackup(backup)) self.assertEqual(np*nr, self.checkBackup(backup))
# Check that a backup cluster can be restarted. # Check that a backup cluster can be restarted.
# (U -> B propagation after restart) # (U -> B propagation after restart)
backup.stop() backup.stop()
backup.start() backup.start()
self.assertEqual(backup.neoctl.getClusterState(), self.assertEqual(backup.neoctl.getClusterState(),
...@@ -151,16 +151,17 @@ class ReplicationTests(NEOThreadedTest): ...@@ -151,16 +151,17 @@ class ReplicationTests(NEOThreadedTest):
backup.stop() backup.stop()
# U -> B propagation with Mb -> Sb' (secondary, Replicate from primary Sb) delayed # U -> B propagation with Mb -> Sb' (secondary, Replicate from primary Sb) delayed
# TODO also test: "U -> B propagation with Mb -> Sb (Replicate) delayed" ? # TODO also test: "U -> B propagation with Mb -> Sb (Replicate) delayed" ?
from neo.storage.database import manager as dbmanager # from neo.storage.database import manager as dbmanager
from neo.master import handlers as mhandler # from neo.master import handlers as mhandler
#dbmanager.X = 1 # #dbmanager.X = 1
#mhandler.X = 1 # #mhandler.X = 1
# (tid, upstream_name, source_dict) # # (tid, upstream_name, source_dict)
#return True # #return True
#return not upstream_name and all(source_dict.itervalues()) # #return not upstream_name and all(source_dict.itervalues())
return upstream_name != "" # return upstream_name != ""
backup.start() backup.start()
backup.neoctl.setClusterState(ClusterStates.STARTING_BACKUP) backup.neoctl.setClusterState(ClusterStates.STARTING_BACKUP)
self.tic() self.tic()
...@@ -193,7 +194,7 @@ class ReplicationTests(NEOThreadedTest): ...@@ -193,7 +194,7 @@ class ReplicationTests(NEOThreadedTest):
dbmanager.X = 0 dbmanager.X = 0
mhandler.X = 0 mhandler.X = 0
# S -> Sb (AddObject) delayed XXX not only S -> Sb: also Sb -> Sb' # S -> Sb (AddObject) delayed XXX not only S -> Sb: also Sb -> Sb'
backup.start() backup.start()
backup.neoctl.setClusterState(ClusterStates.STARTING_BACKUP) backup.neoctl.setClusterState(ClusterStates.STARTING_BACKUP)
self.tic() self.tic()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment