Skip to content

Commit

Permalink
feat: fragment test is concurrent among fragments
Browse files Browse the repository at this point in the history
Within a session, e.g. Python 3.9, all fragment GAPICs are generated
and tested concurrently.
  • Loading branch information
software-dov committed Oct 29, 2021
1 parent 4475efd commit 0033054
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ jobs:
- name: Install nox.
run: |
python -m pip install nox
- name: Run unit tests.
- name: Run fragment tests.
run: nox -s fragment-${{ matrix.python }}
integration:
runs-on: ubuntu-latest
Expand Down
81 changes: 53 additions & 28 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

from __future__ import absolute_import
from concurrent.futures import ThreadPoolExecutor
from pathlib import Path
import os
import sys
Expand All @@ -34,7 +35,6 @@
"3.7",
"3.8",
"3.9",
"3.10",
)

NEWEST_PYTHON = "3.9"
Expand Down Expand Up @@ -74,6 +74,54 @@ def unit(session):
if os.path.splitext(f)[1] == ".proto" and f.startswith("test_")
)

# Note: this class lives outside 'fragment'
# so that, if necessary, it can be pickled for a ProcessPoolExecutor
# A callable class is necessary so that the session can be closed over
# instead of passed in, which simplifies the invocation via map.
class FragTester:
def __init__(self, session):
self.session = session

def __call__(self, frag):
with tempfile.TemporaryDirectory() as tmp_dir:
# Generate the fragment GAPIC.
outputs = []
outputs.append(
self.session.run(
"python",
"-m",
"grpc_tools.protoc",
f"--proto_path={str(FRAG_DIR)}",
f"--python_gapic_out={tmp_dir}",
"--python_gapic_opt=transport=grpc+rest",
str(frag),
external=True,
silent=True,
)
)

# Install the generated fragment library.
# Note: install into the tempdir to prevent issues
# with running pip concurrently.
self.session.install(tmp_dir, "-e", ".", "-t", tmp_dir, "-qqq")

# Run the fragment's generated unit tests.
# Don't bother parallelizing them: we already parallelize
# the fragments, and there usually aren't too many tests per fragment.
outputs.append(
self.session.run(
"py.test",
"--quiet",
f"--cov-config={str(Path(tmp_dir) / '.coveragerc')}",
"--cov-report=term",
"--cov-fail-under=100",
str(Path(tmp_dir) / "tests" / "unit"),
silent=True,
)
)

return "".join(outputs)


# TODO(dovs): ads templates
@nox.session(python=ALL_PYTHON)
Expand All @@ -87,36 +135,13 @@ def fragment(session):
"pytest-asyncio",
"grpcio-tools",
)

session.install("-e", ".")

for frag in FRAGMENT_FILES:
with tempfile.TemporaryDirectory() as tmp_dir:
# Generate the fragment GAPIC.
session.run(
"python",
"-m",
"grpc_tools.protoc",
f"--proto_path={str(FRAG_DIR)}",
f"--python_gapic_out={tmp_dir}",
"--python_gapic_opt=transport=grpc+rest",
str(frag),
external=True,
)

# Install the generated fragment library.
session.install(tmp_dir, "-e", ".")
with ThreadPoolExecutor() as p:
all_outs = p.map(FragTester(session), FRAGMENT_FILES)

# Run the fragment's generated unit tests.
session.run(
"py.test",
"--quiet",
"-n=auto",
f"--cov-config={str(Path(tmp_dir) / '.coveragerc')}",
"--cov-report=term",
"--cov-fail-under=100",
str(Path(tmp_dir) / "tests" / "unit"),
)
output = "".join(all_outs)
session.log(output)


# TODO(yon-mg): -add compute context manager that includes rest transport
Expand Down

0 comments on commit 0033054

Please sign in to comment.