fix: Add py_test targets

PiperOrigin-RevId: 463701296
3 years ago · abe15226ba
parent 1d31f2fbeb
commit abe15226ba
298 changed files with 3326 additions and 60 deletions
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -2,3 +2,4 @@ alias(
    name = "build_gen",
    actual = "@rules_gapic//bazel:build_file_generator",
 )
+
--- a/20
+++ b/20
@ -45,6 +45,19 @@ http_archive(
    url = "https://github.com/bazelbuild/rules_python/archive/0.9.0.tar.gz",
 )

+http_archive(
+    name = "rules_pkg",
+    sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
+        "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
+    ],
+)
+
+load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
+
+rules_pkg_dependencies()
+
 http_archive(
    name = "com_google_protobuf",
    sha256 = "c29d8b4b79389463c546f98b15aa4391d4ed7ec459340c47bffe15db63eb9126",
@ -79,6 +92,7 @@ rules_proto_toolchains()
 # This must be above the download of gRPC (in C++ section) and rules_gapic because both repositories depend on rules_go
 # and we would rather manage our version of rules_go explicitly rather than depend on the version those bring in transitively.
 _io_bazel_rules_go_version = "0.33.0"
+
 http_archive(
    name = "io_bazel_rules_go",
    sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
@ -97,9 +111,9 @@ go_register_toolchains(version = "1.16")
 # rules_gapic also depends on rules_go, so it must come after our own dependency on rules_go.
 # It must also come before gapic-generator-go so as to ensure that it does not bring in an old
 # version of rules_gapic.
-_rules_gapic_version = "0.14.1"
+_rules_gapic_version = "0.15.0"

-_rules_gapic_sha256 = "8483dfe3def57fb6549167dfc9792cdb878af2d521340fc50f094050a7a4180d"
+_rules_gapic_sha256 = "1da19934301ed71a1faa6a4dc19c9c1c01729fe31a58edcf520befc1002af22d"

 http_archive(
    name = "rules_gapic",
@ -264,7 +278,7 @@ load("@rules_python//python:pip.bzl", "pip_install")

 pip_install()

-_gapic_generator_python_version = "1.1.1"
+_gapic_generator_python_version = "1.1.2"

 http_archive(
    name = "gapic_generator_python",
--- a/google/ads/admob/v1/BUILD.bazel
+++ b/google/ads/admob/v1/BUILD.bazel
@ -158,6 +158,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
    "py_grpc_library",
    "py_proto_library",
 )
@ -180,6 +181,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "admob_py_gapic_test",
+    srcs = [
+        "admob_py_gapic_pytest.py",
+        "admob_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":admob_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "ads-admob-v1-py",
--- a/google/analytics/admin/v1alpha/BUILD.bazel
+++ b/google/analytics/admin/v1alpha/BUILD.bazel
@ -158,6 +158,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -166,6 +167,16 @@ py_gapic_library(
    grpc_service_config = "admin_grpc_service_config.json",
 )

+py_test(
+    name = "admin_py_gapic_test",
+    srcs = [
+        "admin_py_gapic_pytest.py",
+        "admin_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":admin_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "google-analytics-admin-v1alpha-py",
--- a/google/analytics/admin/v1beta/BUILD.bazel
+++ b/google/analytics/admin/v1beta/BUILD.bazel
@ -95,6 +95,7 @@ java_gapic_test(
 # Open Source Packages
 java_gapic_assembly_gradle_pkg(
    name = "google-cloud-analytics-admin-v1beta-java",
+    include_samples = True,
    transport = "grpc+rest",
    deps = [
        ":admin_java_gapic",
@ -102,7 +103,6 @@ java_gapic_assembly_gradle_pkg(
        ":admin_java_proto",
        ":admin_proto",
    ],
-    include_samples = True,
 )

 ##############################################################################
@ -151,8 +151,8 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-analytics-admin-v1beta-go",
    deps = [
        ":admin_go_gapic",
-        ":admin_go_gapic_srcjar-test.srcjar",
        ":admin_go_gapic_srcjar-metadata.srcjar",
+        ":admin_go_gapic_srcjar-test.srcjar",
        ":admin_go_proto",
    ],
 )
@ -164,6 +164,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -173,6 +174,16 @@ py_gapic_library(
    service_yaml = "analyticsadmin.yaml",
 )

+py_test(
+    name = "admin_py_gapic_test",
+    srcs = [
+        "admin_py_gapic_pytest.py",
+        "admin_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":admin_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "analytics-admin-v1beta-py",
@ -257,8 +268,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
    "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
    "ruby_proto_library",
 )
--- a/google/analytics/data/v1alpha/BUILD.bazel
+++ b/google/analytics/data/v1alpha/BUILD.bazel
@ -159,6 +159,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -168,6 +169,16 @@ py_gapic_library(
    service_yaml = "analyticsdata_v1alpha.yaml",
 )

+py_test(
+    name = "data_py_gapic_test",
+    srcs = [
+        "data_py_gapic_pytest.py",
+        "data_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":data_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "analytics-data-v1alpha-py",
--- a/google/analytics/data/v1beta/BUILD.bazel
+++ b/google/analytics/data/v1beta/BUILD.bazel
@ -156,6 +156,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -164,6 +165,16 @@ py_gapic_library(
    grpc_service_config = "analytics_data_grpc_service_config.json",
 )

+py_test(
+    name = "data_py_gapic_test",
+    srcs = [
+        "data_py_gapic_pytest.py",
+        "data_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":data_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "google-analytics-data-v1beta-py",
--- a/google/api/servicecontrol/v1/BUILD.bazel
+++ b/google/api/servicecontrol/v1/BUILD.bazel
@ -173,6 +173,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -186,6 +187,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "servicecontrol_py_gapic_test",
+    srcs = [
+        "servicecontrol_py_gapic_pytest.py",
+        "servicecontrol_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":servicecontrol_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "google-cloud-servicecontrol-v1-py",
--- a/google/api/servicecontrol/v2/BUILD.bazel
+++ b/google/api/servicecontrol/v2/BUILD.bazel
@ -161,6 +161,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -174,6 +175,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "servicecontrol_py_gapic_test",
+    srcs = [
+        "servicecontrol_py_gapic_pytest.py",
+        "servicecontrol_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":servicecontrol_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "api-servicecontrol-v2-py",
--- a/google/api/servicemanagement/v1/BUILD.bazel
+++ b/google/api/servicemanagement/v1/BUILD.bazel
@ -171,6 +171,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -184,6 +185,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "servicemanagement_py_gapic_test",
+    srcs = [
+        "servicemanagement_py_gapic_pytest.py",
+        "servicemanagement_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":servicemanagement_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "google-cloud-servicemanagement-v1-py",
--- a/google/api/serviceusage/v1/BUILD.bazel
+++ b/google/api/serviceusage/v1/BUILD.bazel
@ -173,6 +173,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -186,6 +187,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "serviceusage_py_gapic_test",
+    srcs = [
+        "serviceusage_py_gapic_pytest.py",
+        "serviceusage_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":serviceusage_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "api-serviceusage-v1-py",
--- a/google/api/serviceusage/v1beta1/BUILD.bazel
+++ b/google/api/serviceusage/v1beta1/BUILD.bazel
@ -179,6 +179,17 @@ py_gapic_library(
    grpc_service_config = "serviceusage_grpc_service_config.json",
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1376 is fixed
+#py_test(
+#    name = "serviceusage_py_gapic_test",
+#    srcs = [
+#        "serviceusage_py_gapic_pytest.py",
+#        "serviceusage_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":serviceusage_py_gapic"],
+#)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "api-serviceusage-v1beta1-py",
--- a/google/appengine/logging/v1/BUILD.bazel
+++ b/google/appengine/logging/v1/BUILD.bazel
@ -63,8 +63,8 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
+    "py_gapic_assembly_pkg",
    "py_gapic_library",
-    "py_gapic_assembly_pkg"
 )

 py_gapic_library(
@ -72,7 +72,7 @@ py_gapic_library(
    srcs = [":logging_proto"],
    opt_args = [
        "warehouse-package-name=google-cloud-appengine-logging",
-         "python-gapic-namespace=google.cloud",
+        "python-gapic-namespace=google.cloud",
        "python-gapic-name=appengine_logging",
    ],
 )
--- a/google/appengine/v1/BUILD.bazel
+++ b/google/appengine/v1/BUILD.bazel
@ -194,6 +194,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -207,6 +208,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "appengine_py_gapic_test",
+    srcs = [
+        "appengine_py_gapic_pytest.py",
+        "appengine_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":appengine_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "google-cloud-appengine-v1-py",
--- a/google/apps/alertcenter/v1beta1/BUILD.bazel
+++ b/google/apps/alertcenter/v1beta1/BUILD.bazel
@ -159,6 +159,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -167,6 +168,16 @@ py_gapic_library(
    grpc_service_config = "alertcenter_grpc_service_config.json",
 )

+py_test(
+    name = "alertcenter_py_gapic_test",
+    srcs = [
+        "alertcenter_py_gapic_pytest.py",
+        "alertcenter_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":alertcenter_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "apps-alertcenter-v1beta1-py",
--- a/google/apps/drive/activity/v2/BUILD.bazel
+++ b/google/apps/drive/activity/v2/BUILD.bazel
@ -160,6 +160,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -168,6 +169,16 @@ py_gapic_library(
    grpc_service_config = "driveactivity_grpc_service_config.json",
 )

+py_test(
+    name = "activity_py_gapic_test",
+    srcs = [
+        "activity_py_gapic_pytest.py",
+        "activity_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":activity_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "drive-activity-v2-py",
--- a/google/apps/market/v2/BUILD.bazel
+++ b/google/apps/market/v2/BUILD.bazel
@ -157,6 +157,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -165,6 +166,16 @@ py_gapic_library(
    grpc_service_config = "service_grpc_service_config.json",
 )

+py_test(
+    name = "marketplace_py_gapic_test",
+    srcs = [
+        "marketplace_py_gapic_pytest.py",
+        "marketplace_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":marketplace_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "hosted-marketplace-v2-py",
--- a/google/apps/script/type/BUILD.bazel
+++ b/google/apps/script/type/BUILD.bazel
@ -87,6 +87,11 @@ py_proto_library(
    deps = [":type_moved_proto"],
 )

+py_proto_library(
+    name = "type_py_original_proto",
+    deps = [":type_proto"],
+)
+
 py_grpc_library(
    name = "type_py_grpc",
    srcs = [":type_moved_proto"],
--- a/google/apps/script/type/calendar/BUILD.bazel
+++ b/google/apps/script/type/calendar/BUILD.bazel
@ -88,6 +88,11 @@ py_proto_library(
    deps = [":calendar_moved_proto"],
 )

+py_proto_library(
+    name = "calendar_py_original_proto",
+    deps = [":calendar_proto"],
+)
+
 py_grpc_library(
    name = "calendar_py_grpc",
    srcs = [":calendar_moved_proto"],
--- a/google/apps/script/type/docs/BUILD.bazel
+++ b/google/apps/script/type/docs/BUILD.bazel
@ -88,6 +88,11 @@ py_proto_library(
    deps = [":docs_moved_proto"],
 )

+py_proto_library(
+    name = "docs_py_original_proto",
+    deps = [":docs_proto"],
+)
+
 py_grpc_library(
    name = "docs_py_grpc",
    srcs = [":docs_moved_proto"],
--- a/google/apps/script/type/drive/BUILD.bazel
+++ b/google/apps/script/type/drive/BUILD.bazel
@ -85,6 +85,11 @@ py_proto_library(
    deps = [":drive_moved_proto"],
 )

+py_proto_library(
+    name = "drive_py_original_proto",
+    deps = [":drive_proto"],
+)
+
 py_grpc_library(
    name = "drive_py_grpc",
    srcs = [":drive_moved_proto"],
--- a/google/apps/script/type/gmail/BUILD.bazel
+++ b/google/apps/script/type/gmail/BUILD.bazel
@ -87,6 +87,11 @@ py_proto_library(
    deps = [":gmail_moved_proto"],
 )

+py_proto_library(
+    name = "gmail_py_original_proto",
+    deps = [":gmail_proto"],
+)
+
 py_grpc_library(
    name = "gmail_py_grpc",
    srcs = [":gmail_moved_proto"],
--- a/google/apps/script/type/sheets/BUILD.bazel
+++ b/google/apps/script/type/sheets/BUILD.bazel
@ -88,6 +88,11 @@ py_proto_library(
    deps = [":sheets_moved_proto"],
 )

+py_proto_library(
+    name = "sheets_py_original_proto",
+    deps = [":sheets_proto"],
+)
+
 py_grpc_library(
    name = "sheets_py_grpc",
    srcs = [":sheets_moved_proto"],
--- a/google/apps/script/type/slides/BUILD.bazel
+++ b/google/apps/script/type/slides/BUILD.bazel
@ -88,6 +88,11 @@ py_proto_library(
    deps = [":slides_moved_proto"],
 )

+py_proto_library(
+    name = "slides_py_original_proto",
+    deps = [":slides_proto"],
+)
+
 py_grpc_library(
    name = "slides_py_grpc",
    srcs = [":slides_moved_proto"],
--- a/google/area120/tables/v1alpha1/BUILD.bazel
+++ b/google/area120/tables/v1alpha1/BUILD.bazel
@ -157,6 +157,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -165,6 +166,16 @@ py_gapic_library(
    grpc_service_config = "tables_grpc_service_config.json",
 )

+py_test(
+    name = "tables_py_gapic_test",
+    srcs = [
+        "tables_py_gapic_pytest.py",
+        "tables_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":tables_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "area120-tables-v1alpha1-py",
--- a/google/bigtable/admin/v2/BUILD.bazel
+++ b/google/bigtable/admin/v2/BUILD.bazel
@ -167,6 +167,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -178,6 +179,19 @@ py_gapic_library(
        "python-gapic-name=bigtable_admin",
        "autogen-snippets=False",
    ],
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "bigtable_admin_py_gapic_test",
+    srcs = [
+        "bigtable_admin_py_gapic_pytest.py",
+        "bigtable_admin_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":bigtable_admin_py_gapic"],
 )

 # Open Source Packages
--- a/google/bigtable/v2/BUILD.bazel
+++ b/google/bigtable/v2/BUILD.bazel
@ -150,6 +150,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -162,6 +163,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "bigtable_py_gapic_test",
+    srcs = [
+        "bigtable_py_gapic_pytest.py",
+        "bigtable_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":bigtable_py_gapic"],
+)
+
 py_gapic_assembly_pkg(
    name = "bigtable-v2-py",
    deps = [
--- a/google/chromeos/moblab/v1beta1/BUILD.bazel
+++ b/google/chromeos/moblab/v1beta1/BUILD.bazel
@ -166,6 +166,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -174,6 +175,16 @@ py_gapic_library(
    grpc_service_config = "moblab_grpc_service_config.json",
 )

+py_test(
+    name = "moblab_py_gapic_test",
+    srcs = [
+        "moblab_py_gapic_pytest.py",
+        "moblab_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":moblab_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "chromeos-moblab-v1beta1-py",
--- a/google/chromeos/uidetection/v1/BUILD.bazel
+++ b/google/chromeos/uidetection/v1/BUILD.bazel
@ -157,6 +157,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -165,6 +166,16 @@ py_gapic_library(
    grpc_service_config = "ui_detection_grpc_service_config.json",
 )

+py_test(
+    name = "uidetection_py_gapic_test",
+    srcs = [
+        "uidetection_py_gapic_pytest.py",
+        "uidetection_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":uidetection_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "chromeos-uidetection-v1-py",
--- a/google/cloud/accessapproval/v1/BUILD.bazel
+++ b/google/cloud/accessapproval/v1/BUILD.bazel
@ -158,6 +158,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -169,6 +170,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "accessapproval_py_gapic_test",
+    srcs = [
+        "accessapproval_py_gapic_pytest.py",
+        "accessapproval_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":accessapproval_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "accessapproval-v1-py",
--- a/google/cloud/aiplatform/v1/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/BUILD.bazel
@ -290,6 +290,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 _PY_GAPIC_SUBPACKAGE_DEPS = [
@ -304,6 +305,19 @@ py_gapic_library(
    srcs = [":aiplatform_proto"],
    grpc_service_config = "aiplatform_grpc_service_config.json",
    service_yaml = "aiplatform_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "aiplatform_py_gapic_test",
+    srcs = [
+        "aiplatform_py_gapic_pytest.py",
+        "aiplatform_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":aiplatform_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/aiplatform/v1/schema/predict/instance/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/schema/predict/instance/BUILD.bazel
@ -97,11 +97,11 @@ py_grpc_library(

 py_gapic_library(
    name = "instance_py_gapic",
+    srcs = [":instance_proto"],
    opt_args = [
        "python-gapic-namespace=google.cloud.aiplatform.v1.schema.predict",
        "python-gapic-name=instance",
    ],
-    srcs = [":instance_proto"],
 )

 # Open Source Packages
@ -109,9 +109,21 @@ py_gapic_assembly_pkg(
    name = "instance-py",
    deps = [
        ":instance_py_gapic",
-    ]
+    ],
 )

+#load("@gapic_generator_java//rules_java_gapic:java_gapic.bzl", "java_generator_request_dump")
+#
+#java_generator_request_dump(
+#    name = "instance_request_dump",
+#    srcs = [":instance_py_gapic"],
+#    #    opt_args = [
+#    #        "python-gapic-namespace=google.cloud.aiplatform.v1.schema.predict",
+#    #        "python-gapic-name=instance",
+#    #    ],
+#    transport = "grpc",
+#)
+
 ##############################################################################
 # PHP
 ##############################################################################
--- a/google/cloud/aiplatform/v1/schema/predict/params/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/schema/predict/params/BUILD.bazel
@ -94,11 +94,11 @@ py_grpc_library(

 py_gapic_library(
    name = "params_py_gapic",
+    srcs = [":params_proto"],
    opt_args = [
        "python-gapic-namespace=google.cloud.aiplatform.v1.schema.predict",
        "python-gapic-name=params",
    ],
-    srcs = [":params_proto"],
 )

 # Open Source Packages
@ -106,7 +106,7 @@ py_gapic_assembly_pkg(
    name = "params-py",
    deps = [
        ":params_py_gapic",
-    ]
+    ],
 )

 ##############################################################################
@ -138,7 +138,6 @@ load(
    "nodejs_gapic_library",
 )

-
 ##############################################################################
 # Ruby
 ##############################################################################
--- a/google/cloud/aiplatform/v1/schema/predict/prediction/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/schema/predict/prediction/BUILD.bazel
@ -79,7 +79,6 @@ load(
    "py_gapic_library",
    "py_grpc_library",
    "py_proto_library",
-
 )

 moved_proto_library(
@ -107,18 +106,18 @@ py_grpc_library(

 py_gapic_library(
    name = "prediction_py_gapic",
+    srcs = [":prediction_proto"],
    opt_args = [
-        "python-gapic-namespace=google.cloud.aiplatform.v1.schema.predict", # Replace with the current version
+        "python-gapic-namespace=google.cloud.aiplatform.v1.schema.predict",  # Replace with the current version
        "python-gapic-name=prediction",
    ],
-    srcs = [":prediction_proto"],
 )

 py_gapic_assembly_pkg(
    name = "prediction-py",
    deps = [
        ":prediction_py_gapic",
-    ]
+    ],
 )

 ##############################################################################
@ -150,7 +149,6 @@ load(
    "nodejs_gapic_library",
 )

-
 ##############################################################################
 # Ruby
 ##############################################################################
--- a/google/cloud/aiplatform/v1beta1/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/BUILD.bazel
@ -285,6 +285,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 _PY_GAPIC_SUBPACKAGE_DEPS = [
@ -299,6 +300,19 @@ py_gapic_library(
    srcs = [":aiplatform_proto"],
    grpc_service_config = "aiplatform_grpc_service_config.json",
    service_yaml = "aiplatform_v1beta1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "aiplatform_py_gapic_test",
+    srcs = [
+        "aiplatform_py_gapic_pytest.py",
+        "aiplatform_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":aiplatform_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel
@ -152,7 +152,6 @@ load(
    "nodejs_gapic_library",
 )

-
 ##############################################################################
 # Ruby
 ##############################################################################
--- a/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel
@ -79,6 +79,7 @@ load(
    "py_gapic_library",
    "py_grpc_library",
    "py_proto_library",
+    "py_test",
 )

 moved_proto_library(
@ -86,7 +87,7 @@ moved_proto_library(
    srcs = [":definition_proto"],
    deps = [
        "//google/api:annotations_proto",
-         "//google/api:field_behavior_proto",
+        "//google/api:field_behavior_proto",
    ],
 )

@ -147,7 +148,6 @@ load(
    "nodejs_gapic_library",
 )

-
 ##############################################################################
 # Ruby
 ##############################################################################
--- a/google/cloud/apigateway/v1/BUILD.bazel
+++ b/google/cloud/apigateway/v1/BUILD.bazel
@ -164,6 +164,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -173,6 +174,16 @@ py_gapic_library(
    opt_args = ["warehouse-package-name=google-cloud-api-gateway"],
 )

+py_test(
+    name = "apigateway_py_gapic_test",
+    srcs = [
+        "apigateway_py_gapic_pytest.py",
+        "apigateway_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":apigateway_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "google-cloud-apigateway-v1-py",
--- a/google/cloud/apigeeconnect/v1/BUILD.bazel
+++ b/google/cloud/apigeeconnect/v1/BUILD.bazel
@ -162,6 +162,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -171,6 +172,16 @@ py_gapic_library(
    opt_args = ["warehouse-package-name=google-cloud-apigee-connect"],
 )

+py_test(
+    name = "apigeeconnect_py_gapic_test",
+    srcs = [
+        "apigeeconnect_py_gapic_pytest.py",
+        "apigeeconnect_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":apigeeconnect_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "apigeeconnect-v1-py",
--- a/google/cloud/apigeeregistry/v1/BUILD.bazel
+++ b/google/cloud/apigeeregistry/v1/BUILD.bazel
@ -181,6 +181,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -195,6 +196,19 @@ py_gapic_library(
    service_yaml = "apigeeregistry_v1.yaml",
 )

+py_test(
+    name = "apigeeregistry_py_gapic_test",
+    srcs = [
+        "apigeeregistry_py_gapic_pytest.py",
+        "apigeeregistry_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [
+        ":apigeeregistry_py_gapic",
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "apigeeregistry-v1-py",
--- a/google/cloud/asset/v1/BUILD.bazel
+++ b/google/cloud/asset/v1/BUILD.bazel
@ -177,12 +177,22 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "asset_py_gapic",
    srcs = [":asset_proto"],
    grpc_service_config = "cloudasset_grpc_service_config.json",
+    deps = [
+        "//google/cloud/orgpolicy/v1:orgpolicy_py_original_proto",
+        "//google/cloud/osconfig/v1:osconfig_py_proto",
+        "//google/iam/v1:policy_py_proto",
+        "//google/identity/accesscontextmanager/v1:access_level_py_proto",
+        "//google/identity/accesscontextmanager/v1:access_policy_py_proto",
+        "//google/identity/accesscontextmanager/v1:accesscontextmanager_py_gapic",
+        "//google/identity/accesscontextmanager/v1:service_perimeter_py_proto",
+    ],
 )

 py_gapic_assembly_pkg(
@ -192,6 +202,16 @@ py_gapic_assembly_pkg(
    ],
 )

+py_test(
+    name = "asset_py_gapic_test",
+    srcs = [
+        "asset_py_gapic_pytest.py",
+        "asset_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":asset_py_gapic"],
+)
+
 ##############################################################################
 # PHP
 ##############################################################################
--- a/google/cloud/asset/v1p1beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p1beta1/BUILD.bazel
@ -150,12 +150,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "asset_py_gapic",
    srcs = [":asset_proto"],
    grpc_service_config = "cloudasset_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "asset_py_gapic_test",
+    srcs = [
+        "asset_py_gapic_pytest.py",
+        "asset_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":asset_py_gapic"],
 )

 py_gapic_assembly_pkg(
--- a/google/cloud/asset/v1p2beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p2beta1/BUILD.bazel
@ -163,12 +163,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "asset_py_gapic",
    srcs = [":asset_proto"],
    grpc_service_config = "cloudasset_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "asset_py_gapic_test",
+    srcs = [
+        "asset_py_gapic_pytest.py",
+        "asset_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":asset_py_gapic"],
 )

 py_gapic_assembly_pkg(
--- a/google/cloud/asset/v1p4beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p4beta1/BUILD.bazel
@ -160,12 +160,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "asset_py_gapic",
    srcs = [":asset_proto"],
    grpc_service_config = "cloudasset_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "asset_py_gapic_test",
+    srcs = [
+        "asset_py_gapic_pytest.py",
+        "asset_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":asset_py_gapic"],
 )

 py_gapic_assembly_pkg(
--- a/google/cloud/asset/v1p5beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p5beta1/BUILD.bazel
@ -158,12 +158,31 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "asset_py_gapic",
    srcs = [":asset_proto"],
    grpc_service_config = "cloudasset_grpc_service_config.json",
+    deps = [
+        "//google/cloud/orgpolicy/v1:orgpolicy_py_original_proto",
+        "//google/iam/v1:iam_policy_py_proto",
+        "//google/identity/accesscontextmanager/v1:access_level_py_proto",
+        "//google/identity/accesscontextmanager/v1:access_policy_py_proto",
+        "//google/identity/accesscontextmanager/v1:accesscontextmanager_py_gapic",
+        "//google/identity/accesscontextmanager/v1:service_perimeter_py_proto",
+    ],
+)
+
+py_test(
+    name = "asset_py_gapic_test",
+    srcs = [
+        "asset_py_gapic_pytest.py",
+        "asset_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":asset_py_gapic"],
 )

 py_gapic_assembly_pkg(
--- a/google/cloud/asset/v1p7beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p7beta1/BUILD.bazel
@ -184,6 +184,17 @@ py_gapic_library(
    grpc_service_config = "cloudasset_grpc_service_config.json",
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1376 is fixed
+#py_test(
+#    name = "asset_py_gapic_test",
+#    srcs = [
+#        "asset_py_gapic_pytest.py",
+#        "asset_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":asset_py_gapic"],
+#)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "asset-v1p7beta1-py",
--- a/google/cloud/assuredworkloads/v1/BUILD.bazel
+++ b/google/cloud/assuredworkloads/v1/BUILD.bazel
@ -169,6 +169,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -179,6 +180,16 @@ py_gapic_library(
    service_yaml = "assuredworkloads_v1.yaml",
 )

+py_test(
+    name = "assuredworkloads_py_gapic_test",
+    srcs = [
+        "assuredworkloads_py_gapic_pytest.py",
+        "assuredworkloads_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":assuredworkloads_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "assuredworkloads-v1-py",
--- a/google/cloud/assuredworkloads/v1beta1/BUILD.bazel
+++ b/google/cloud/assuredworkloads/v1beta1/BUILD.bazel
@ -170,6 +170,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -180,6 +181,16 @@ py_gapic_library(
    service_yaml = "assuredworkloads_v1beta1.yaml",
 )

+py_test(
+    name = "assuredworkloads_py_gapic_test",
+    srcs = [
+        "assuredworkloads_py_gapic_pytest.py",
+        "assuredworkloads_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":assuredworkloads_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "assuredworkloads-v1beta1-py",
--- a/google/cloud/automl/v1/BUILD.bazel
+++ b/google/cloud/automl/v1/BUILD.bazel
@ -181,6 +181,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -189,6 +190,16 @@ py_gapic_library(
    grpc_service_config = "automl_grpc_service_config.json",
 )

+py_test(
+    name = "automl_py_gapic_test",
+    srcs = [
+        "automl_py_gapic_pytest.py",
+        "automl_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":automl_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "automl-v1-py",
--- a/google/cloud/automl/v1beta1/BUILD.bazel
+++ b/google/cloud/automl/v1beta1/BUILD.bazel
@ -190,6 +190,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -198,6 +199,16 @@ py_gapic_library(
    grpc_service_config = "automl_grpc_service_config.json",
 )

+py_test(
+    name = "automl_py_gapic_test",
+    srcs = [
+        "automl_py_gapic_pytest.py",
+        "automl_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":automl_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "automl-v1beta1-py",
--- a/google/cloud/baremetalsolution/v2/BUILD.bazel
+++ b/google/cloud/baremetalsolution/v2/BUILD.bazel
@ -173,6 +173,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -186,6 +187,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "baremetalsolution_py_gapic_test",
+    srcs = [
+        "baremetalsolution_py_gapic_pytest.py",
+        "baremetalsolution_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":baremetalsolution_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "baremetalsolution-v2-py",
--- a/google/cloud/batch/v1/BUILD.bazel
+++ b/google/cloud/batch/v1/BUILD.bazel
@ -178,6 +178,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -185,6 +186,19 @@ py_gapic_library(
    srcs = [":batch_proto"],
    grpc_service_config = "batch_grpc_service_config.json",
    service_yaml = "batch_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "batch_py_gapic_test",
+    srcs = [
+        "batch_py_gapic_pytest.py",
+        "batch_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":batch_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/batch/v1alpha/BUILD.bazel
+++ b/google/cloud/batch/v1alpha/BUILD.bazel
@ -94,13 +94,13 @@ java_gapic_test(
 # Open Source Packages
 java_gapic_assembly_gradle_pkg(
    name = "google-cloud-batch-v1alpha-java",
+    include_samples = True,
    deps = [
        ":batch_java_gapic",
        ":batch_java_grpc",
        ":batch_java_proto",
        ":batch_proto",
    ],
-    include_samples = True,
 )

 ##############################################################################
@ -130,13 +130,13 @@ go_gapic_library(
    srcs = [":batch_proto_with_info"],
    grpc_service_config = "batch_grpc_service_config.json",
    importpath = "cloud.google.com/go/batch/apiv1alpha;batch",
-    service_yaml = None,
    metadata = True,
+    service_yaml = None,
    deps = [
        ":batch_go_proto",
        "//google/longrunning:longrunning_go_proto",
-        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
    ],
 )
@ -153,8 +153,8 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-batch-v1alpha-go",
    deps = [
        ":batch_go_gapic",
-        ":batch_go_gapic_srcjar-test.srcjar",
        ":batch_go_gapic_srcjar-metadata.srcjar",
+        ":batch_go_gapic_srcjar-test.srcjar",
        ":batch_go_proto",
    ],
 )
@ -166,6 +166,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -175,6 +176,16 @@ py_gapic_library(
    service_yaml = None,
 )

+py_test(
+    name = "batch_py_gapic_test",
+    srcs = [
+        "batch_py_gapic_pytest.py",
+        "batch_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":batch_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "batch-v1alpha-py",
@ -259,8 +270,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
    "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
    "ruby_proto_library",
 )
@ -285,9 +296,9 @@ ruby_cloud_gapic_library(
        "ruby-cloud-gem-name=google-cloud-batch-v1alpha",
    ],
    grpc_service_config = "batch_grpc_service_config.json",
-    service_yaml = "batch_v1alpha.yaml",
    ruby_cloud_description = "Google Cloud Batch is a fully managed service used by scientists, VFX artists, developers to easily and efficiently run batch workloads on Google Cloud. This service manages provisioning of resources to satisfy the requirements of the batch jobs for a variety of workloads including ML, HPC, VFX rendering, transcoding, genomics and others.",
    ruby_cloud_title = "Batch V1alpha",
+    service_yaml = "batch_v1alpha.yaml",
    deps = [
        ":batch_ruby_grpc",
        ":batch_ruby_proto",
--- a/google/cloud/beyondcorp/appconnections/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/appconnections/v1/BUILD.bazel
@ -39,6 +39,7 @@ load(
    "proto_library_with_info",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
    "ruby_cloud_gapic_library",
    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
@ -174,12 +175,25 @@ py_gapic_library(
    name = "appconnections_py_gapic",
    srcs = [":appconnections_proto"],
    grpc_service_config = "beyondcorp-appconnections_grpc_service_config.json",
-    service_yaml = "beyondcorp_v1.yaml",
    opt_args = [
        "warehouse-package-name=google-cloud-beyondcorp-appconnections",
        "python-gapic-namespace=google.cloud",
        "python-gapic-name=beyondcorp_appconnections",
    ],
+    service_yaml = "beyondcorp_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "appconnections_py_gapic_test",
+    srcs = [
+        "appconnections_py_gapic_pytest.py",
+        "appconnections_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":appconnections_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/beyondcorp/appconnectors/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/appconnectors/v1/BUILD.bazel
@ -39,6 +39,7 @@ load(
    "proto_library_with_info",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
    "ruby_cloud_gapic_library",
    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
@ -178,12 +179,25 @@ py_gapic_library(
    name = "appconnectors_py_gapic",
    srcs = [":appconnectors_proto"],
    grpc_service_config = "beyondcorp-appconnectors_grpc_service_config.json",
-    service_yaml = "beyondcorp_v1.yaml",
    opt_args = [
        "warehouse-package-name=google-cloud-beyondcorp-appconnectors",
        "python-gapic-namespace=google.cloud",
        "python-gapic-name=beyondcorp_appconnectors",
    ],
+    service_yaml = "beyondcorp_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "appconnectors_py_gapic_test",
+    srcs = [
+        "appconnectors_py_gapic_pytest.py",
+        "appconnectors_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":appconnectors_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/beyondcorp/appgateways/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/appgateways/v1/BUILD.bazel
@ -39,6 +39,7 @@ load(
    "proto_library_with_info",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
    "ruby_cloud_gapic_library",
    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
@ -173,12 +174,25 @@ py_gapic_library(
    name = "appgateways_py_gapic",
    srcs = [":appgateways_proto"],
    grpc_service_config = "beyondcorp-appgateways_grpc_service_config.json",
-    service_yaml = "beyondcorp_v1.yaml",
    opt_args = [
        "warehouse-package-name=google-cloud-beyondcorp-appgateways",
        "python-gapic-namespace=google.cloud",
        "python-gapic-name=beyondcorp_appgateways",
    ],
+    service_yaml = "beyondcorp_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "appgateways_py_gapic_test",
+    srcs = [
+        "appgateways_py_gapic_pytest.py",
+        "appgateways_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":appgateways_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/beyondcorp/clientconnectorservices/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/clientconnectorservices/v1/BUILD.bazel
@ -39,6 +39,7 @@ load(
    "proto_library_with_info",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
    "ruby_cloud_gapic_library",
    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
@ -173,12 +174,25 @@ py_gapic_library(
    name = "clientconnectorservices_py_gapic",
    srcs = [":clientconnectorservices_proto"],
    grpc_service_config = "beyondcorp-clientconnectorservices_grpc_service_config.json",
-    service_yaml = "beyondcorp_v1.yaml",
    opt_args = [
        "warehouse-package-name=google-cloud-beyondcorp-clientconnectorservices",
        "python-gapic-namespace=google.cloud",
        "python-gapic-name=beyondcorp_clientconnectorservices",
    ],
+    service_yaml = "beyondcorp_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "clientconnectorservices_py_gapic_test",
+    srcs = [
+        "clientconnectorservices_py_gapic_pytest.py",
+        "clientconnectorservices_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":clientconnectorservices_py_gapic"],
 )

 # Open Source Packages
@ -261,9 +275,9 @@ ruby_cloud_gapic_library(
        "ruby-cloud-api-shortname=beyondcorp",
    ],
    grpc_service_config = "beyondcorp-clientconnectorservices_grpc_service_config.json",
-    service_yaml = "beyondcorp_v1.yaml",
    ruby_cloud_description = "Beyondcorp Enterprise provides identity and context aware access controls for enterprise resources and enables zero-trust access. Using the Beyondcorp Enterprise APIs, enterprises can set up multi-cloud and on-prem connectivity using the App Connector hybrid connectivity solution.",
    ruby_cloud_title = "BeyondCorp ClientConnectorServices V1",
+    service_yaml = "beyondcorp_v1.yaml",
    deps = [
        ":clientconnectorservices_ruby_grpc",
        ":clientconnectorservices_ruby_proto",
--- a/google/cloud/beyondcorp/clientgateways/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/clientgateways/v1/BUILD.bazel
@ -39,6 +39,7 @@ load(
    "proto_library_with_info",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
    "ruby_cloud_gapic_library",
    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
@ -173,12 +174,25 @@ py_gapic_library(
    name = "clientgateways_py_gapic",
    srcs = [":clientgateways_proto"],
    grpc_service_config = "beyondcorp-clientgateways_grpc_service_config.json",
-    service_yaml = "beyondcorp_v1.yaml",
    opt_args = [
        "warehouse-package-name=google-cloud-beyondcorp-clientgateways",
        "python-gapic-namespace=google.cloud",
        "python-gapic-name=beyondcorp_clientgateways",
    ],
+    service_yaml = "beyondcorp_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "clientgateways_py_gapic_test",
+    srcs = [
+        "clientgateways_py_gapic_pytest.py",
+        "clientgateways_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":clientgateways_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/bigquery/connection/v1/BUILD.bazel
+++ b/google/cloud/bigquery/connection/v1/BUILD.bazel
@ -155,6 +155,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -165,6 +166,19 @@ py_gapic_library(
        "python-gapic-namespace=google.cloud",
        "python-gapic-name=bigquery_connection",
    ],
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "connection_py_gapic_test",
+    srcs = [
+        "connection_py_gapic_pytest.py",
+        "connection_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":connection_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel
@ -160,8 +160,22 @@ py_gapic_library(
    name = "connection_py_gapic",
    srcs = [":connection_proto"],
    grpc_service_config = "bigqueryconnection_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1372 is fixed
+#py_test(
+#    name = "connection_py_gapic_test",
+#    srcs = [
+#        "connection_py_gapic_pytest.py",
+#        "connection_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":connection_py_gapic"],
+#)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "bigquery-connection-v1beta1-py",
--- a/google/cloud/bigquery/dataexchange/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/dataexchange/v1beta1/BUILD.bazel
@ -186,6 +186,17 @@ py_gapic_library(
    ],
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1376 is fixed
+#py_test(
+#    name = "dataexchange_py_gapic_test",
+#    srcs = [
+#        "dataexchange_py_gapic_pytest.py",
+#        "dataexchange_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":dataexchange_py_gapic"],
+#)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "bigquery-dataexchange-v1beta1-py",
--- a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
+++ b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
@ -156,6 +156,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -168,6 +169,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "datatransfer_py_gapic_test",
+    srcs = [
+        "datatransfer_py_gapic_pytest.py",
+        "datatransfer_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datatransfer_py_gapic"],
+)
+
 py_gapic_assembly_pkg(
    name = "bigquery-datatransfer-v1-py",
    deps = [
--- a/google/cloud/bigquery/logging/v1/BUILD.bazel
+++ b/google/cloud/bigquery/logging/v1/BUILD.bazel
@ -66,8 +66,8 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
+    "py_gapic_assembly_pkg",
    "py_gapic_library",
-    "py_gapic_assembly_pkg"
 )

 py_gapic_library(
@ -117,7 +117,6 @@ load(
    "nodejs_gapic_library",
 )

-
 ##############################################################################
 # Ruby
 ##############################################################################
--- a/google/cloud/bigquery/migration/v2/BUILD.bazel
+++ b/google/cloud/bigquery/migration/v2/BUILD.bazel
@ -173,6 +173,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -185,6 +186,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "migration_py_gapic_test",
+    srcs = [
+        "migration_py_gapic_pytest.py",
+        "migration_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":migration_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "bigquery-migration-v2-py",
--- a/google/cloud/bigquery/migration/v2alpha/BUILD.bazel
+++ b/google/cloud/bigquery/migration/v2alpha/BUILD.bazel
@ -171,6 +171,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -183,6 +184,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "migration_py_gapic_test",
+    srcs = [
+        "migration_py_gapic_pytest.py",
+        "migration_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":migration_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "bigquery-migration-v2alpha-py",
--- a/google/cloud/bigquery/reservation/v1/BUILD.bazel
+++ b/google/cloud/bigquery/reservation/v1/BUILD.bazel
@ -164,6 +164,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -176,6 +177,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "reservation_py_gapic_test",
+    srcs = [
+        "reservation_py_gapic_pytest.py",
+        "reservation_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":reservation_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "bigquery-reservation-v1-py",
--- a/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel
@ -154,6 +154,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -162,6 +163,16 @@ py_gapic_library(
    grpc_service_config = "bigqueryreservation_grpc_service_config.json",
 )

+py_test(
+    name = "reservation_py_gapic_test",
+    srcs = [
+        "reservation_py_gapic_pytest.py",
+        "reservation_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":reservation_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "bigquery-reservation-v1beta1-py",
--- a/google/cloud/bigquery/storage/v1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1/BUILD.bazel
@ -163,6 +163,17 @@ py_gapic_library(
    ],
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1374 is fixed
+#py_test(
+#    name = "storage_py_gapic_test",
+#    srcs = [
+#        "storage_py_gapic_pytest.py",
+#        "storage_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":storage_py_gapic"],
+#)
+
 py_gapic_assembly_pkg(
    name = "bigquery-storage-v1-py",
    deps = [
--- a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
@ -148,6 +148,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -156,6 +157,16 @@ py_gapic_library(
    grpc_service_config = "bigquerystorage_grpc_service_config.json",
 )

+py_test(
+    name = "storage_py_gapic_test",
+    srcs = [
+        "storage_py_gapic_pytest.py",
+        "storage_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":storage_py_gapic"],
+)
+
 py_gapic_assembly_pkg(
    name = "bigquery-storage-v1beta1-py",
    deps = [
--- a/google/cloud/bigquery/storage/v1beta2/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1beta2/BUILD.bazel
@ -164,6 +164,17 @@ py_gapic_library(
    ],
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1374 is fixed
+#py_test(
+#    name = "storage_py_gapic_test",
+#    srcs = [
+#        "storage_py_gapic_pytest.py",
+#        "storage_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":storage_py_gapic"],
+#)
+
 py_gapic_assembly_pkg(
    name = "bigquery-storage-v1beta2-py",
    deps = [
--- a/google/cloud/bigquery/v2/BUILD.bazel
+++ b/google/cloud/bigquery/v2/BUILD.bazel
@ -160,6 +160,17 @@ py_gapic_library(
    opt_args = ["autogen-snippets=False"],
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1372 is fixed
+#py_test(
+#    name = "bigquery_py_gapic_test",
+#    srcs = [
+#        "bigquery_py_gapic_pytest.py",
+#        "bigquery_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":bigquery_py_gapic"],
+#)
+
 py_gapic_assembly_pkg(
    name = "bigquery-v2-py",
    deps = [
--- a/google/cloud/billing/budgets/v1/BUILD.bazel
+++ b/google/cloud/billing/budgets/v1/BUILD.bazel
@ -37,6 +37,7 @@ load(
    "proto_library_with_info",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
    "ruby_cloud_gapic_library",
    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
@ -168,6 +169,16 @@ py_gapic_library(
    grpc_service_config = "billingbudgets_grpc_service_config.json",
 )

+py_test(
+    name = "budgets_py_gapic_test",
+    srcs = [
+        "budgets_py_gapic_pytest.py",
+        "budgets_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":budgets_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "billing-budgets-v1-py",
--- a/google/cloud/billing/budgets/v1beta1/BUILD.bazel
+++ b/google/cloud/billing/budgets/v1beta1/BUILD.bazel
@ -160,6 +160,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -168,6 +169,16 @@ py_gapic_library(
    grpc_service_config = "billingbudgets_grpc_service_config.json",
 )

+py_test(
+    name = "budgets_py_gapic_test",
+    srcs = [
+        "budgets_py_gapic_pytest.py",
+        "budgets_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":budgets_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "billing-budgets-v1beta1-py",
--- a/google/cloud/billing/v1/BUILD.bazel
+++ b/google/cloud/billing/v1/BUILD.bazel
@ -158,12 +158,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "billing_py_gapic",
    srcs = [":billing_proto"],
    grpc_service_config = "cloud_billing_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "billing_py_gapic_test",
+    srcs = [
+        "billing_py_gapic_pytest.py",
+        "billing_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":billing_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/binaryauthorization/v1/BUILD.bazel
+++ b/google/cloud/binaryauthorization/v1/BUILD.bazel
@ -169,12 +169,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "binaryauthorization_py_gapic",
    srcs = [":binaryauthorization_proto"],
    grpc_service_config = "binaryauthorization_grpc_service_config.json",
+    deps = [
+        "//grafeas/v1:grafeas_py_proto",
+    ],
+)
+
+py_test(
+    name = "binaryauthorization_py_gapic_test",
+    srcs = [
+        "binaryauthorization_py_gapic_pytest.py",
+        "binaryauthorization_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":binaryauthorization_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
+++ b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
@ -160,6 +160,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -168,6 +169,16 @@ py_gapic_library(
    grpc_service_config = "binaryauthorization_grpc_service_config.json",
 )

+py_test(
+    name = "binaryauthorization_py_gapic_test",
+    srcs = [
+        "binaryauthorization_py_gapic_pytest.py",
+        "binaryauthorization_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":binaryauthorization_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "binaryauthorization-v1beta1-py",
--- a/google/cloud/certificatemanager/v1/BUILD.bazel
+++ b/google/cloud/certificatemanager/v1/BUILD.bazel
@ -170,6 +170,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -184,6 +185,16 @@ py_gapic_library(
    service_yaml = "certificatemanager_v1.yaml",
 )

+py_test(
+    name = "certificatemanager_py_gapic_test",
+    srcs = [
+        "certificatemanager_py_gapic_pytest.py",
+        "certificatemanager_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":certificatemanager_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "certificatemanager-v1-py",
--- a/google/cloud/channel/v1/BUILD.bazel
+++ b/google/cloud/channel/v1/BUILD.bazel
@ -186,6 +186,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -195,6 +196,16 @@ py_gapic_library(
    service_yaml = "cloudchannel_v1.yaml",
 )

+py_test(
+    name = "channel_py_gapic_test",
+    srcs = [
+        "channel_py_gapic_pytest.py",
+        "channel_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":channel_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "channel-v1-py",
--- a/google/cloud/clouddms/v1/BUILD.bazel
+++ b/google/cloud/clouddms/v1/BUILD.bazel
@ -165,6 +165,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -174,6 +175,16 @@ py_gapic_library(
    opt_args = ["warehouse-package-name=google-cloud-dms"],
 )

+py_test(
+    name = "clouddms_py_gapic_test",
+    srcs = [
+        "clouddms_py_gapic_pytest.py",
+        "clouddms_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":clouddms_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "clouddms-v1-py",
--- a/google/cloud/commerce/consumer/procurement/v1alpha1/BUILD.bazel
+++ b/google/cloud/commerce/consumer/procurement/v1alpha1/BUILD.bazel
@ -93,6 +93,7 @@ java_gapic_test(
 # Open Source Packages
 java_gapic_assembly_gradle_pkg(
    name = "google-cloud-consumer-procurement-v1alpha1-java",
+    include_samples = True,
    transport = "grpc+rest",
    deps = [
        ":procurement_java_gapic",
@ -100,7 +101,6 @@ java_gapic_assembly_gradle_pkg(
        ":procurement_java_proto",
        ":procurement_proto",
    ],
-    include_samples = True,
 )

 ##############################################################################
@ -136,8 +136,8 @@ go_gapic_library(
    deps = [
        ":procurement_go_proto",
        "//google/longrunning:longrunning_go_proto",
-        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -153,8 +153,8 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-consumer-procurement-v1alpha1-go",
    deps = [
        ":procurement_go_gapic",
-        ":procurement_go_gapic_srcjar-test.srcjar",
        ":procurement_go_gapic_srcjar-metadata.srcjar",
+        ":procurement_go_gapic_srcjar-test.srcjar",
        ":procurement_go_proto",
    ],
 )
@ -166,6 +166,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -175,6 +176,16 @@ py_gapic_library(
    service_yaml = "cloudcommerceconsumerprocurement_v1alpha1.yaml",
 )

+py_test(
+    name = "procurement_py_gapic_test",
+    srcs = [
+        "procurement_py_gapic_pytest.py",
+        "procurement_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":procurement_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "consumer-procurement-v1alpha1-py",
@ -259,8 +270,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
    "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
    "ruby_proto_library",
 )
--- a/google/cloud/common/BUILD.bazel
+++ b/google/cloud/common/BUILD.bazel
@ -63,7 +63,6 @@ go_proto_library(
    ],
 )

-
 ##############################################################################
 # PHP
 ##############################################################################
@ -91,6 +90,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_proto_library",
 )

 py_gapic_library(
@ -98,6 +98,11 @@ py_gapic_library(
    srcs = [":common_proto"],
 )

+py_proto_library(
+    name = "common_py_proto",
+    deps = [":common_proto"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "common-py",
--- a/google/cloud/contactcenterinsights/v1/BUILD.bazel
+++ b/google/cloud/contactcenterinsights/v1/BUILD.bazel
@ -169,6 +169,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -182,6 +183,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "contactcenterinsights_py_gapic_test",
+    srcs = [
+        "contactcenterinsights_py_gapic_pytest.py",
+        "contactcenterinsights_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":contactcenterinsights_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "contactcenterinsights-v1-py",
--- a/google/cloud/datacatalog/v1/BUILD.bazel
+++ b/google/cloud/datacatalog/v1/BUILD.bazel
@ -177,12 +177,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "datacatalog_py_gapic",
    srcs = [":datacatalog_proto"],
    grpc_service_config = "datacatalog_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "datacatalog_py_gapic_test",
+    srcs = [
+        "datacatalog_py_gapic_pytest.py",
+        "datacatalog_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datacatalog_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/datacatalog/v1beta1/BUILD.bazel
+++ b/google/cloud/datacatalog/v1beta1/BUILD.bazel
@ -161,12 +161,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "datacatalog_py_gapic",
    srcs = [":datacatalog_proto"],
    grpc_service_config = "datacatalog_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "datacatalog_py_gapic_test",
+    srcs = [
+        "datacatalog_py_gapic_pytest.py",
+        "datacatalog_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datacatalog_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/dataform/v1alpha2/BUILD.bazel
+++ b/google/cloud/dataform/v1alpha2/BUILD.bazel
@ -180,6 +180,17 @@ py_gapic_library(
    service_yaml = "dataform_v1alpha2.yaml",
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1348 is fixed
+#py_test(
+#    name = "dataform_py_gapic_test",
+#    srcs = [
+#        "dataform_py_gapic_pytest.py",
+#        "dataform_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":dataform_py_gapic"],
+#)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "dataform-v1alpha2-py",
--- a/google/cloud/datafusion/v1/BUILD.bazel
+++ b/google/cloud/datafusion/v1/BUILD.bazel
@ -163,6 +163,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -176,6 +177,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "datafusion_py_gapic_test",
+    srcs = [
+        "datafusion_py_gapic_pytest.py",
+        "datafusion_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datafusion_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "datafusion-v1-py",
--- a/google/cloud/datafusion/v1beta1/BUILD.bazel
+++ b/google/cloud/datafusion/v1beta1/BUILD.bazel
@ -170,12 +170,26 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
    name = "datafusion_py_gapic",
    srcs = [":datafusion_proto"],
    grpc_service_config = "datafusion_grpc_service_config.json",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "datafusion_py_gapic_test",
+    srcs = [
+        "datafusion_py_gapic_pytest.py",
+        "datafusion_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datafusion_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/datalabeling/v1beta1/BUILD.bazel
+++ b/google/cloud/datalabeling/v1beta1/BUILD.bazel
@ -162,6 +162,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -170,6 +171,16 @@ py_gapic_library(
    grpc_service_config = "datalabeling_grpc_service_config.json",
 )

+py_test(
+    name = "datalabeling_py_gapic_test",
+    srcs = [
+        "datalabeling_py_gapic_pytest.py",
+        "datalabeling_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datalabeling_py_gapic"],
+)
+
 py_gapic_assembly_pkg(
    name = "datalabeling-v1beta1-py",
    deps = [
--- a/google/cloud/dataplex/v1/BUILD.bazel
+++ b/google/cloud/dataplex/v1/BUILD.bazel
@ -190,6 +190,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -197,6 +198,19 @@ py_gapic_library(
    srcs = [":dataplex_proto"],
    grpc_service_config = "dataplex_grpc_service_config.json",
    service_yaml = "dataplex_v1.yaml",
+    deps = [
+        "//google/iam/v1:iam_policy_py_proto",
+    ],
+)
+
+py_test(
+    name = "dataplex_py_gapic_test",
+    srcs = [
+        "dataplex_py_gapic_pytest.py",
+        "dataplex_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":dataplex_py_gapic"],
 )

 # Open Source Packages
--- a/google/cloud/dataproc/v1/BUILD.bazel
+++ b/google/cloud/dataproc/v1/BUILD.bazel
@ -169,6 +169,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -177,6 +178,16 @@ py_gapic_library(
    grpc_service_config = "dataproc_grpc_service_config.json",
 )

+py_test(
+    name = "dataproc_py_gapic_test",
+    srcs = [
+        "dataproc_py_gapic_pytest.py",
+        "dataproc_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":dataproc_py_gapic"],
+)
+
 py_gapic_assembly_pkg(
    name = "dataproc-v1-py",
    deps = [
--- a/google/cloud/dataqna/v1alpha/BUILD.bazel
+++ b/google/cloud/dataqna/v1alpha/BUILD.bazel
@ -165,6 +165,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -173,6 +174,16 @@ py_gapic_library(
    grpc_service_config = "dataqna_grpc_service_config.json",
 )

+py_test(
+    name = "dataqna_py_gapic_test",
+    srcs = [
+        "dataqna_py_gapic_pytest.py",
+        "dataqna_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":dataqna_py_gapic"],
+)
+
 py_gapic_assembly_pkg(
    name = "dataqna-v1alpha-py",
    deps = [
--- a/google/cloud/datastream/v1/BUILD.bazel
+++ b/google/cloud/datastream/v1/BUILD.bazel
@ -173,6 +173,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -181,6 +182,16 @@ py_gapic_library(
    grpc_service_config = "datastream_grpc_service_config.json",
 )

+py_test(
+    name = "datastream_py_gapic_test",
+    srcs = [
+        "datastream_py_gapic_pytest.py",
+        "datastream_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datastream_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "datastream-v1-py",
--- a/google/cloud/datastream/v1alpha1/BUILD.bazel
+++ b/google/cloud/datastream/v1alpha1/BUILD.bazel
@ -166,6 +166,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -174,6 +175,16 @@ py_gapic_library(
    grpc_service_config = "datastream_grpc_service_config.json",
 )

+py_test(
+    name = "datastream_py_gapic_test",
+    srcs = [
+        "datastream_py_gapic_pytest.py",
+        "datastream_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":datastream_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "datastream-v1alpha1-py",
--- a/google/cloud/deploy/v1/BUILD.bazel
+++ b/google/cloud/deploy/v1/BUILD.bazel
@ -174,6 +174,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -182,6 +183,16 @@ py_gapic_library(
    grpc_service_config = "clouddeploy_grpc_service_config.json",
 )

+py_test(
+    name = "deploy_py_gapic_test",
+    srcs = [
+        "deploy_py_gapic_pytest.py",
+        "deploy_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":deploy_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "deploy-v1-py",
--- a/google/cloud/dialogflow/cx/v3/BUILD.bazel
+++ b/google/cloud/dialogflow/cx/v3/BUILD.bazel
@ -242,6 +242,17 @@ py_gapic_library(
    service_yaml = "dialogflow_v3.yaml",
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1376 is fixed
+#py_test(
+#    name = "cx_py_gapic_test",
+#    srcs = [
+#        "cx_py_gapic_pytest.py",
+#        "cx_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":cx_py_gapic"],
+#)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "dialogflow-cx-v3-py",
--- a/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel
+++ b/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel
@ -242,6 +242,17 @@ py_gapic_library(
    service_yaml = "dialogflow_v3beta1.yaml",
 )

+# Uncomment once https://github.com/googleapis/gapic-generator-python/issues/1376 is fixed
+#py_test(
+#    name = "cx_py_gapic_test",
+#    srcs = [
+#        "cx_py_gapic_pytest.py",
+#        "cx_py_gapic_test.py",
+#    ],
+#    legacy_create_init = False,
+#    deps = [":cx_py_gapic"],
+#)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "dialogflow-cx-v3beta1-py",
--- a/google/cloud/dialogflow/v2/BUILD.bazel
+++ b/google/cloud/dialogflow/v2/BUILD.bazel
@ -233,6 +233,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -242,6 +243,16 @@ py_gapic_library(
    service_yaml = "dialogflow_v2.yaml",
 )

+py_test(
+    name = "dialogflow_py_gapic_test",
+    srcs = [
+        "dialogflow_py_gapic_pytest.py",
+        "dialogflow_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":dialogflow_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "dialogflow-v2-py",
--- a/google/cloud/dialogflow/v2beta1/BUILD.bazel
+++ b/google/cloud/dialogflow/v2beta1/BUILD.bazel
@ -227,6 +227,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -236,6 +237,16 @@ py_gapic_library(
    service_yaml = "dialogflow_v2beta1.yaml",
 )

+py_test(
+    name = "dialogflow_py_gapic_test",
+    srcs = [
+        "dialogflow_py_gapic_pytest.py",
+        "dialogflow_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":dialogflow_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "dialogflow-v2beta1-py",
--- a/google/cloud/documentai/v1/BUILD.bazel
+++ b/google/cloud/documentai/v1/BUILD.bazel
@ -177,6 +177,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -188,6 +189,16 @@ py_gapic_library(
    ],
 )

+py_test(
+    name = "documentai_py_gapic_test",
+    srcs = [
+        "documentai_py_gapic_pytest.py",
+        "documentai_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":documentai_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "documentai-v1-py",
--- a/google/cloud/documentai/v1beta1/BUILD.bazel
+++ b/google/cloud/documentai/v1beta1/BUILD.bazel
@ -161,6 +161,7 @@ load(
    "@com_google_googleapis_imports//:imports.bzl",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
+    "py_test",
 )

 py_gapic_library(
@ -169,6 +170,16 @@ py_gapic_library(
    grpc_service_config = "documentai_grpc_service_config.json",
 )

+py_test(
+    name = "documentai_py_gapic_test",
+    srcs = [
+        "documentai_py_gapic_pytest.py",
+        "documentai_py_gapic_test.py",
+    ],
+    legacy_create_init = False,
+    deps = [":documentai_py_gapic"],
+)
+
 # Open Source Packages
 py_gapic_assembly_pkg(
    name = "documentai-v1beta1-py",
--- a/Show More
+++ b/Show More