Skip to content

Commit 1b9ad76

Browse files
authored
chore(python): fix prerelease session [autoapprove] (#1504)
* chore(python): fix prerelease session * remove samples tests * revert
1 parent 97aff52 commit 1b9ad76

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

synthtool/gcp/templates/python_library/noxfile.py.j2

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

349349
# Install all dependencies
350350
session.install("-e", ".[all, tests, tracing]")
351-
session.install(*UNIT_TEST_STANDARD_DEPENDENCIES)
351+
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
352+
session.install(*unit_deps_all)
352353
system_deps_all = SYSTEM_TEST_STANDARD_DEPENDENCIES + SYSTEM_TEST_EXTERNAL_DEPENDENCIES + SYSTEM_TEST_EXTRAS
353354
session.install(*system_deps_all)
354355

@@ -373,12 +374,6 @@ def prerelease_deps(session):
373374

374375
session.install(*constraints_deps)
375376

376-
if os.path.exists("samples/snippets/requirements.txt"):
377-
session.install("-r", "samples/snippets/requirements.txt")
378-
379-
if os.path.exists("samples/snippets/requirements-test.txt"):
380-
session.install("-r", "samples/snippets/requirements-test.txt")
381-
382377
prerel_deps = [
383378
"protobuf",
384379
# dependency of grpc
@@ -415,11 +410,19 @@ def prerelease_deps(session):
415410
system_test_folder_path = os.path.join("tests", "system")
416411

417412
# Only run system tests if found.
418-
if os.path.exists(system_test_path) or os.path.exists(system_test_folder_path):
419-
session.run("py.test", "tests/system")
420-
421-
snippets_test_path = os.path.join("samples", "snippets")
422-
423-
# Only run samples tests if found.
424-
if os.path.exists(snippets_test_path):
425-
session.run("py.test", "samples/snippets")
413+
if os.path.exists(system_test_path):
414+
session.run(
415+
"py.test",
416+
"--verbose",
417+
f"--junitxml=system_{session.python}_sponge_log.xml",
418+
system_test_path,
419+
*session.posargs,
420+
)
421+
if os.path.exists(system_test_folder_path):
422+
session.run(
423+
"py.test",
424+
"--verbose",
425+
f"--junitxml=system_{session.python}_sponge_log.xml",
426+
system_test_folder_path,
427+
*session.posargs,
428+
)

0 commit comments

Comments
 (0)