From 1e34c4c0c0578fe5465bf73b3c28bfca732be732 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:10:03 -0400
Subject: [PATCH] chore: resolve issue with prerelease presubmit [autoapprove]
 (#339)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(python): fix prerelease session [autoapprove]

Source-Link: https://github.com/googleapis/synthtool/commit/1b9ad7694e44ddb4d9844df55ff7af77b51a4435
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:9db98b055a7f8bd82351238ccaacfd3cda58cdf73012ab58b8da146368330021

* update replacement in owlbot.py

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
---
 .github/.OwlBot.lock.yaml |  4 ++--
 noxfile.py                | 35 ++++++++++++++++++++---------------
 owlbot.py                 | 24 ++++++++----------------
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 58fcbeee..0eb02fda 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:c8878270182edaab99f2927969d4f700c3af265accd472c3425deedff2b7fd93
-# created: 2022-07-14T01:58:16.015625351Z
+  digest: sha256:9db98b055a7f8bd82351238ccaacfd3cda58cdf73012ab58b8da146368330021
+# created: 2022-07-25T16:02:49.174178716Z
diff --git a/noxfile.py b/noxfile.py
index a27a6a65..f9879877 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -363,7 +363,8 @@ def prerelease_deps(session):
 
     # Install all dependencies
     session.install("-e", ".[all, tests, tracing]")
-    session.install(*UNIT_TEST_STANDARD_DEPENDENCIES)
+    unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
+    session.install(*unit_deps_all)
     system_deps_all = (
         SYSTEM_TEST_STANDARD_DEPENDENCIES
         + SYSTEM_TEST_EXTERNAL_DEPENDENCIES
@@ -392,12 +393,6 @@ def prerelease_deps(session):
 
     session.install(*constraints_deps)
 
-    if os.path.exists("samples/snippets/requirements.txt"):
-        session.install("-r", "samples/snippets/requirements.txt")
-
-    if os.path.exists("samples/snippets/requirements-test.txt"):
-        session.install("-r", "samples/snippets/requirements-test.txt")
-
     prerel_deps = [
         "protobuf",
         # dependency of grpc
@@ -434,11 +429,21 @@ def prerelease_deps(session):
     system_test_folder_path = os.path.join("tests", "system")
 
     # Only run system tests if found.
-    if os.path.exists(system_test_path) or os.path.exists(system_test_folder_path):
-        session.run("py.test", "tests/system")
-
-    snippets_test_path = os.path.join("samples", "snippets")
-
-    # Only run samples tests if found.
-    if os.path.exists(snippets_test_path):
-        session.run("py.test", "samples/snippets")
+    if os.path.exists(system_test_path):
+        session.run(
+            "py.test",
+            "--verbose",
+            f"--junitxml=system_{session.python}_sponge_log.xml",
+            system_test_path,
+            env=env,
+            *session.posargs,
+        )
+    if os.path.exists(system_test_folder_path):
+        session.run(
+            "py.test",
+            "--verbose",
+            f"--junitxml=system_{session.python}_sponge_log.xml",
+            system_test_folder_path,
+            env=env,
+            *session.posargs,
+        )
diff --git a/owlbot.py b/owlbot.py
index ca00e0ca..e19fe0ad 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -137,26 +137,18 @@ def system(session, disable_grpc):
 """,
 )
 
-assert 1 == s.replace(
+assert 2 == s.replace(
     "noxfile.py",
-    """\
-    system_test_path,
-""",
-    """\
-    system_test_path,
-    env=env,
-""",
+    """system_test_path,\n""",
+    """system_test_path,
+            env=env,\n""",
 )
 
-assert 1 == s.replace(
+assert 2 == s.replace(
     "noxfile.py",
-    """\
-    system_test_folder_path,
-""",
-    """\
-    system_test_folder_path,
-    env=env,
-""",
+    """system_test_folder_path,\n""",
+    """system_test_folder_path,
+            env=env,\n""",
 )
 
 # Add nox session to exercise doctests