From 055cf07b29086b9a3732b087356fefb5cda3b4b0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 17:14:16 +0000 Subject: [PATCH] chore: detect samples tests in nested directories (#436) Source-Link: https://github.com/googleapis/synthtool/commit/50db768f450a50d7c1fd62513c113c9bb96fd434 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:e09366bdf0fd9c8976592988390b24d53583dd9f002d476934da43725adbb978 --- packages/google-cloud-automl/.github/.OwlBot.lock.yaml | 3 +-- packages/google-cloud-automl/samples/beta/noxfile.py | 4 ++-- packages/google-cloud-automl/samples/snippets/noxfile.py | 4 ++-- packages/google-cloud-automl/samples/tables/noxfile.py | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/google-cloud-automl/.github/.OwlBot.lock.yaml b/packages/google-cloud-automl/.github/.OwlBot.lock.yaml index 8bbec48aff83..aa547962eb0a 100644 --- a/packages/google-cloud-automl/.github/.OwlBot.lock.yaml +++ b/packages/google-cloud-automl/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:993a058718e84a82fda04c3177e58f0a43281a996c7c395e0a56ccc4d6d210d7 - + digest: sha256:e09366bdf0fd9c8976592988390b24d53583dd9f002d476934da43725adbb978 diff --git a/packages/google-cloud-automl/samples/beta/noxfile.py b/packages/google-cloud-automl/samples/beta/noxfile.py index 5fcb9d7461f2..0398d72ff690 100644 --- a/packages/google-cloud-automl/samples/beta/noxfile.py +++ b/packages/google-cloud-automl/samples/beta/noxfile.py @@ -207,8 +207,8 @@ def _session_tests( session: nox.sessions.Session, post_install: Callable = None ) -> None: # check for presence of tests - test_list = glob.glob("*_test.py") + glob.glob("test_*.py") - test_list.extend(glob.glob("tests")) + test_list = glob.glob("**/*_test.py", recursive=True) + glob.glob("**/test_*.py", recursive=True) + test_list.extend(glob.glob("**/tests", recursive=True)) if len(test_list) == 0: print("No tests found, skipping directory.") diff --git a/packages/google-cloud-automl/samples/snippets/noxfile.py b/packages/google-cloud-automl/samples/snippets/noxfile.py index 5fcb9d7461f2..0398d72ff690 100644 --- a/packages/google-cloud-automl/samples/snippets/noxfile.py +++ b/packages/google-cloud-automl/samples/snippets/noxfile.py @@ -207,8 +207,8 @@ def _session_tests( session: nox.sessions.Session, post_install: Callable = None ) -> None: # check for presence of tests - test_list = glob.glob("*_test.py") + glob.glob("test_*.py") - test_list.extend(glob.glob("tests")) + test_list = glob.glob("**/*_test.py", recursive=True) + glob.glob("**/test_*.py", recursive=True) + test_list.extend(glob.glob("**/tests", recursive=True)) if len(test_list) == 0: print("No tests found, skipping directory.") diff --git a/packages/google-cloud-automl/samples/tables/noxfile.py b/packages/google-cloud-automl/samples/tables/noxfile.py index 5fcb9d7461f2..0398d72ff690 100644 --- a/packages/google-cloud-automl/samples/tables/noxfile.py +++ b/packages/google-cloud-automl/samples/tables/noxfile.py @@ -207,8 +207,8 @@ def _session_tests( session: nox.sessions.Session, post_install: Callable = None ) -> None: # check for presence of tests - test_list = glob.glob("*_test.py") + glob.glob("test_*.py") - test_list.extend(glob.glob("tests")) + test_list = glob.glob("**/*_test.py", recursive=True) + glob.glob("**/test_*.py", recursive=True) + test_list.extend(glob.glob("**/tests", recursive=True)) if len(test_list) == 0: print("No tests found, skipping directory.")