Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Commit 4d779c6

Browse files
chore: resolve issue with prerelease presubmit [autoapprove] (#211)
Source-Link: googleapis/synthtool@1b9ad76 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:9db98b055a7f8bd82351238ccaacfd3cda58cdf73012ab58b8da146368330021
1 parent 03ec475 commit 4d779c6

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:c8878270182edaab99f2927969d4f700c3af265accd472c3425deedff2b7fd93
17-
# created: 2022-07-14T01:58:16.015625351Z
16+
digest: sha256:9db98b055a7f8bd82351238ccaacfd3cda58cdf73012ab58b8da146368330021
17+
# created: 2022-07-25T16:02:49.174178716Z

noxfile.py

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,8 @@ def prerelease_deps(session):
334334

335335
# Install all dependencies
336336
session.install("-e", ".[all, tests, tracing]")
337-
session.install(*UNIT_TEST_STANDARD_DEPENDENCIES)
337+
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
338+
session.install(*unit_deps_all)
338339
system_deps_all = (
339340
SYSTEM_TEST_STANDARD_DEPENDENCIES
340341
+ SYSTEM_TEST_EXTERNAL_DEPENDENCIES
@@ -363,12 +364,6 @@ def prerelease_deps(session):
363364

364365
session.install(*constraints_deps)
365366

366-
if os.path.exists("samples/snippets/requirements.txt"):
367-
session.install("-r", "samples/snippets/requirements.txt")
368-
369-
if os.path.exists("samples/snippets/requirements-test.txt"):
370-
session.install("-r", "samples/snippets/requirements-test.txt")
371-
372367
prerel_deps = [
373368
"protobuf",
374369
# dependency of grpc
@@ -405,11 +400,19 @@ def prerelease_deps(session):
405400
system_test_folder_path = os.path.join("tests", "system")
406401

407402
# Only run system tests if found.
408-
if os.path.exists(system_test_path) or os.path.exists(system_test_folder_path):
409-
session.run("py.test", "tests/system")
410-
411-
snippets_test_path = os.path.join("samples", "snippets")
412-
413-
# Only run samples tests if found.
414-
if os.path.exists(snippets_test_path):
415-
session.run("py.test", "samples/snippets")
403+
if os.path.exists(system_test_path):
404+
session.run(
405+
"py.test",
406+
"--verbose",
407+
f"--junitxml=system_{session.python}_sponge_log.xml",
408+
system_test_path,
409+
*session.posargs,
410+
)
411+
if os.path.exists(system_test_folder_path):
412+
session.run(
413+
"py.test",
414+
"--verbose",
415+
f"--junitxml=system_{session.python}_sponge_log.xml",
416+
system_test_folder_path,
417+
*session.posargs,
418+
)

0 commit comments

Comments
 (0)