Switch all tests to py2and3_test

src/python/grpcio_tests/tests/channelz/BUILD.bazel

@@ -1,6 +1,8 @@
 package(default_visibility = ["//visibility:public"])
 
-py_test(
+load("//bazel:python_rules.bzl", "py2and3_test")
+
+py2and3_test(
     name = "channelz_servicer_test",
     srcs = ["_channelz_servicer_test.py"],
     main = "_channelz_servicer_test.py",

src/python/grpcio_tests/tests/health_check/BUILD.bazel

@@ -1,6 +1,7 @@
 package(default_visibility = ["//visibility:public"])
+load("//bazel:python_rules.bzl", "py2and3_test")
 
-py_test(
+py2and3_test(
     name = "health_servicer_test",
     srcs = ["_health_servicer_test.py"],
     main = "_health_servicer_test.py",

src/python/grpcio_tests/tests/interop/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("//bazel:python_rules.bzl", "py2and3_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -80,7 +81,7 @@ py_library(
     ],
 )
 
-py_test(
+py2and3_test(
     name = "_insecure_intraop_test",
     size = "small",
     srcs = ["_insecure_intraop_test.py"],
@@ -99,7 +100,7 @@ py_test(
     ],
 )
 
-py_test(
+py2and3_test(
     name = "_secure_intraop_test",
     size = "small",
     srcs = ["_secure_intraop_test.py"],

src/python/grpcio_tests/tests/reflection/BUILD.bazel

@@ -1,8 +1,9 @@
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("//bazel:python_rules.bzl", "py2and3_test")
 
 package(default_visibility = ["//visibility:public"])
 
-py_test(
+py2and3_test(
     name="_reflection_servicer_test",
     size="small",
     timeout="moderate",

src/python/grpcio_tests/tests/status/BUILD.bazel

@@ -1,8 +1,9 @@
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("//bazel:python_rules.bzl", "py2and3_test")
 
 package(default_visibility = ["//visibility:public"])
 
-py_test(
+py2and3_test(
     name = "grpc_status_test",
     srcs = ["_grpc_status_test.py"],
     main = "_grpc_status_test.py",

src/python/grpcio_tests/tests/unit/_cython/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@grpc_python_dependencies//:requirements.bzl", "requirement")
+load("//bazel:python_rules.bzl", "py2and3_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -23,7 +24,7 @@ py_library(
 )
 
 [
-    py_test(
+    py2and3_test(
         name=test_file_name[:-3],
         size="small",
         srcs=[test_file_name],

src/python/grpcio_tests/tests/unit/framework/foundation/BUILD.bazel

@@ -1,11 +1,12 @@
 package(default_visibility = ["//visibility:public"])
+load("//bazel:python_rules.bzl", "py2and3_test")
 
 py_library(
     name = "stream_testing",
     srcs = ["stream_testing.py"],
 )
 
-py_test(
+py2and3_test(
     name = "logging_pool_test",
     srcs = ["_logging_pool_test.py"],
     main = "_logging_pool_test.py",