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

Commit 7caa01d

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

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

.github/.OwlBot.lock.yaml

+2-2
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

+18-15
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@ def prerelease_deps(session):
333333

334334
# Install all dependencies
335335
session.install("-e", ".[all, tests, tracing]")
336-
session.install(*UNIT_TEST_STANDARD_DEPENDENCIES)
336+
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
337+
session.install(*unit_deps_all)
337338
system_deps_all = (
338339
SYSTEM_TEST_STANDARD_DEPENDENCIES
339340
+ SYSTEM_TEST_EXTERNAL_DEPENDENCIES
@@ -362,12 +363,6 @@ def prerelease_deps(session):
362363

363364
session.install(*constraints_deps)
364365

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

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

0 commit comments

Comments
 (0)