Merge pull request #14609 from apolcyn/cleanup_grpc_py_binary

Clean up grpc_py_binary build rule

bazel/grpc_build_system.bzl

@@ -170,17 +170,13 @@ def grpc_sh_binary(name, srcs, data = []):
     srcs = srcs,
     data = data)
 
-def grpc_py_binary(name, srcs, data = [], deps = []):
-  if name == "test_dns_server":
-    deps = _get_external_deps([
-      "twisted",
-      "yaml",
-    ])
+def grpc_py_binary(name, srcs, data = [], deps = [], external_deps = [], testonly = False):
   native.py_binary(
     name = name,
     srcs = srcs,
     data = data,
-    deps = deps)
+    deps = deps + _get_external_deps(external_deps)
+  )
 
 def grpc_package(name, visibility = "private", features = []):
   if visibility == "tests":

test/cpp/naming/BUILD

@@ -37,10 +37,11 @@ grpc_sh_binary(
 grpc_py_binary(
   name = "test_dns_server",
   srcs = ["test_dns_server.py"],
+  testonly = True,
   data = [
       "resolver_test_record_groups.yaml",
   ],
-  deps = [
+  external_deps = [
       "twisted",
       "yaml",
   ]