From 8a0e7d8444e4881c8b5e9f9791c19f7f3e0c2625 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Jul 2022 22:24:08 -0400
Subject: [PATCH] chore(python): fix prerelease session [autoapprove] (#613)

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

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml |  4 ++--
 noxfile.py                | 33 ++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 1ce608523..0eb02fda4 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:e7bb19d47c13839fe8c147e50e02e8b6cf5da8edd1af8b82208cd6f66cc2829c
-# created: 2022-07-05T18:31:20.838186805Z
+  digest: sha256:9db98b055a7f8bd82351238ccaacfd3cda58cdf73012ab58b8da146368330021
+# created: 2022-07-25T16:02:49.174178716Z
diff --git a/noxfile.py b/noxfile.py
index 6875c9b44..1c208b4c3 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -372,7 +372,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
@@ -401,12 +402,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
@@ -443,11 +438,19 @@ 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,
+            *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,
+            *session.posargs,
+        )