Nox fixing these tests.

test/encrypted_transport.py

@@ -288,6 +288,7 @@ class TestSecure(unittest.TestCase):
         extra_args=server_extra_args('vttablet-server-instance',
                                      'vttablet-client'))
     shard_0_slave.start_vttablet(
+        wait_for_state='NOT_SERVING',
         table_acl_config=table_acl_config,
         extra_args=server_extra_args('vttablet-server-instance',
                                      'vttablet-client'))

test/mysqlctl.py

@@ -79,7 +79,7 @@ class TestMysqlctl(unittest.TestCase):
     replica_tablet.start_vttablet(wait_for_state=None,
                                   extra_env={'MYSQL_FLAVOR': ''})
     master_tablet.wait_for_vttablet_state('SERVING')
-    replica_tablet.wait_for_vttablet_state('SERVING')
+    replica_tablet.wait_for_vttablet_state('NOT_SERVING')
 
     # reparent tablets, which requires flavor detection
     utils.run_vtctl(['InitShardMaster', 'test_keyspace/0',

test/rowcache_invalidator.py

@@ -55,8 +55,9 @@ def setUpModule():
 
     for t in all_tablets:
       t.start_vttablet(memcache=True, wait_for_state=None)
-    for t in all_tablets:
-      t.wait_for_vttablet_state('SERVING')
+    master_tablet.wait_for_vttablet_state('SERVING')
+    for t in [replica_tablet, replica2_tablet]:
+      t.wait_for_vttablet_state('NOT_SERVING')
 
     utils.run_vtctl(['InitShardMaster', 'test_keyspace/0',
                      master_tablet.tablet_alias], auto_log=True)