Address comments.

Author: thompsonja

test/cluster/sandbox/fix_served_types_test.py

@@ -18,6 +18,11 @@
         dict(tablet_type=topodata_pb2.RDONLY),
     ])
 
+_just_master = dict(
+    served_types=[
+        dict(tablet_type=topodata_pb2.MASTER),
+    ])
+
 
 class FixServedTypesTest(unittest.TestCase):
 
@@ -27,7 +32,7 @@ def test_get_vtctl_commands(self):
         [('-80', _all_types), ('80-', _all_types), ('0', {})],
         [('-80', {}), ('80-', {}), ('0', _all_types)],
         [('-80', {}), ('80-', _all_types), ('0', _all_types)],
-        [('-80', {}), ('80-', _no_master), ('0', _all_types)]
+        [('-80', _no_master), ('80-', _no_master), ('0', _just_master)]
     ]]
 
     expected_results = [
@@ -59,7 +64,9 @@ def test_get_vtctl_commands(self):
          ['SetShardServedTypes', 'foo/0', 'rdonly'],
          ['SetShardServedTypes', 'foo/0', 'master']],
 
-        [['SetShardServedTypes', '--remove', 'foo/80-', 'replica'],
+        [['SetShardServedTypes', '--remove', 'foo/-80', 'replica'],
+         ['SetShardServedTypes', '--remove', 'foo/-80', 'rdonly'],
+         ['SetShardServedTypes', '--remove', 'foo/80-', 'replica'],
          ['SetShardServedTypes', '--remove', 'foo/80-', 'rdonly'],
          ['SetShardServedTypes', 'foo/0', 'replica'],
          ['SetShardServedTypes', 'foo/0', 'rdonly'],

test/cluster/sandbox/vitess_kubernetes_sandbox.py

@@ -230,7 +230,7 @@ def generate_helm_sandlet(self):
     helm_sandlet.components.add_component(wait_for_mysql_subprocess)
 
     # Add a subprocess task to ensure serving types are correct. This is useful
-    # for resharding sandboxes where multiple keyspaces share a name.
+    # for resharding sandboxes where keyspaces have overlapping sets of shards.
     fix_served_types_subprocess = subprocess_component.Subprocess(
         'fix_served_types', self.name, 'fix_served_types.py', self.log_dir,
         namespace=self.name,