Fixing integration tests with new states.

riseofthetigers · Apr 28, 2014 · e4c9b17 · e4c9b17
1 parent 049568a
commit e4c9b17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/test/initial_sharding.py b/test/initial_sharding.py
@@ -330,7 +330,7 @@ def test_resharding(self):
       t.start_vttablet(wait_for_state=None)
     for t in [shard_0_master, shard_0_replica, shard_0_rdonly,
               shard_1_master, shard_1_replica, shard_1_rdonly]:
-      t.wait_for_vttablet_state('CONNECTING')
+      t.wait_for_vttablet_state('NOT_SERVING')
 
     utils.run_vtctl(['ReparentShard', '-force', 'test_keyspace/-80',
                      shard_0_master.tablet_alias], auto_log=True)

diff --git a/test/resharding.py b/test/resharding.py
@@ -413,12 +413,9 @@ def test_resharding(self):
     for t in [shard_2_master, shard_2_replica1, shard_2_replica2,
               shard_3_master, shard_3_replica, shard_3_rdonly]:
       t.start_vttablet(wait_for_state=None)
-    shard_2_master.wait_for_vttablet_state('CONNECTING')
-    shard_2_replica1.wait_for_vttablet_state('NOT_SERVING')
-    shard_2_replica2.wait_for_vttablet_state('NOT_SERVING')
-    shard_3_master.wait_for_vttablet_state('CONNECTING')
-    shard_3_replica.wait_for_vttablet_state('NOT_SERVING')
-    shard_3_rdonly.wait_for_vttablet_state('CONNECTING')
+    for t in [shard_2_master, shard_2_replica1, shard_2_replica2,
+              shard_3_master, shard_3_replica, shard_3_rdonly]:
+      t.wait_for_vttablet_state('NOT_SERVING')
 
     utils.run_vtctl(['ReparentShard', '-force', 'test_keyspace/80-C0',
                      shard_2_master.tablet_alias], auto_log=True)

diff --git a/test/vertical_split.py b/test/vertical_split.py
@@ -267,7 +267,7 @@ def test_vertical_split(self):
     for t in [source_master, source_replica, source_rdonly]:
       t.wait_for_vttablet_state('SERVING')
     for t in [destination_master, destination_replica, destination_rdonly]:
-      t.wait_for_vttablet_state('CONNECTING')
+      t.wait_for_vttablet_state('NOT_SERVING')
 
     # reparent to make the tablets work
     utils.run_vtctl(['ReparentShard', '-force', 'source_keyspace/0',