Fixing a couple tiny details.

py/vttest/environment.py

@@ -50,7 +50,7 @@ def cleanup_test_directory(directory):
   Parameters:
     directory: the value returned by get_test_directory().
   """
-#  shutil.rmtree(directory)
+  shutil.rmtree(directory)
 
 
 def extra_vtgate_parameters():

py/vttest/local_database.py

@@ -50,6 +50,8 @@ class LocalDatabase(object):
 
   def vtgate_addr(self):
     """Get the host:port for vtgate."""
+    if environment.get_protocol() == 'grpc':
+      return vt_processes.vtgate_process.grpc_addr()
     return vt_processes.vtgate_process.addr()
 
   def config(self):