Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,13 @@ jobs:
run: |
sudo mkdir -p /usr/src/showcase
sudo chown -R ${USER} /usr/src/
curl --location https://github.com/googleapis/gapic-showcase/releases/download/v0.12.0/gapic-showcase-0.12.0-linux-amd64.tar.gz --output /usr/src/showcase/showcase-0.12.0-linux-amd64.tar.gz
curl --location https://github.com/googleapis/gapic-showcase/releases/download/v${SHOWCASE_VERSION}/gapic-showcase-${SHOWCASE_VERSION}-linux-amd64.tar.gz --output /usr/src/showcase/showcase-${SHOWCASE_VERSION}-linux-amd64.tar.gz
cd /usr/src/showcase/
tar -xf showcase-*
./gapic-showcase run &
cd -
env:
SHOWCASE_VERSION: 0.16.0
- name: Install nox.
run: python -m pip install nox
- name: Install protoc 3.12.1.
Expand Down Expand Up @@ -156,7 +158,7 @@ jobs:
sudo mkdir gapic_showcase
sudo chown ${USER} gapic_showcase
cd gapic_showcase
curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v0.11.0/gapic-showcase-0.11.0-linux-amd64.tar.gz | tar xz
curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v${SHOWCASE_VERSION}/gapic-showcase-${SHOWCASE_VERSION}-linux-amd64.tar.gz | tar xz
./gapic-showcase run --mtls-ca-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-key=/tmp/workspace/tests/cert/mtls.key &
showcase_pid=$!

Expand All @@ -170,6 +172,8 @@ jobs:

cd ..
nox -s ${{ matrix.target }}
env:
SHOWCASE_VERSION: 0.16.0
# TODO(yon-mg): add compute unit tests
showcase-unit:
strategy:
Expand Down Expand Up @@ -206,6 +210,8 @@ jobs:
run: python -m pip install nox
- name: Run unit tests.
run: nox -s showcase_unit${{ matrix.variant }}-${{ matrix.python }}
env:
SHOWCASE_VERSION: 0.16.0
showcase-unit-add-iam-methods:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -234,6 +240,8 @@ jobs:
run: python -m pip install nox
- name: Run unit tests.
run: nox -s showcase_unit_add_iam_methods
env:
SHOWCASE_VERSION: 0.16.0
showcase-mypy:
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -265,6 +273,8 @@ jobs:
run: python -m pip install nox
- name: Typecheck the generated output.
run: nox -s showcase_mypy${{ matrix.variant }}
env:
SHOWCASE_VERSION: 0.16.0
snippetgen:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -304,15 +314,11 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y pandoc gcc git
- name: Install nox and codecov.
- name: Install nox.
run: |
python -m pip install nox
python -m pip install codecov
- name: Run unit tests.
run: nox -s unit-${{ matrix.python }}
- name: Submit coverage data to codecov.
run: codecov
if: always()
integration:
runs-on: ubuntu-latest
steps:
Expand Down
23 changes: 6 additions & 17 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import shutil


showcase_version = "0.11.0"
showcase_version = os.environ.get("SHOWCASE_VERSION", "0.16.0")
ADS_TEMPLATES = path.join(path.dirname(__file__), "gapic", "ads-templates")


Expand All @@ -34,7 +34,7 @@ def unit(session):
"""Run the unit test suite."""

session.install(
"coverage", "pytest", "pytest-cov", "pytest-xdist", "pyfakefs",
"pytest", "pytest-xdist", "pyfakefs",
)
session.install("-e", ".")

Expand All @@ -45,10 +45,6 @@ def unit(session):
or [
"-vv",
"-n=auto",
"--cov=gapic",
"--cov-config=.coveragerc",
"--cov-report=term",
"--cov-report=html",
path.join("tests", "unit"),
]
),
Expand Down Expand Up @@ -185,9 +181,7 @@ def showcase_mtls_alternative_templates(session):

def run_showcase_unit_tests(session, fail_under=100):
session.install(
"coverage",
"pytest",
"pytest-cov",
"pytest-xdist",
"asyncmock",
"pytest-asyncio",
Expand All @@ -198,9 +192,6 @@ def run_showcase_unit_tests(session, fail_under=100):
"py.test",
"-n=auto",
"--quiet",
"--cov=google",
"--cov-append",
f"--cov-fail-under={str(fail_under)}",
*(session.posargs or [path.join("tests", "unit")]),
)

Expand All @@ -226,12 +217,11 @@ def showcase_unit(
# google-auth is a transitive dependency so it isn't in the
# lower bound constraints file produced above.
session.install("google-auth==1.21.1")
run_showcase_unit_tests(session, fail_under=0)
run_showcase_unit_tests(session)

# 2. Run the tests again with latest version of dependencies
session.install(".", "--upgrade", "--force-reinstall")
# This time aggregate coverage should reach 100%
run_showcase_unit_tests(session, fail_under=100)
run_showcase_unit_tests(session)


@nox.session(python=["3.7", "3.8", "3.9"])
Expand All @@ -258,12 +248,11 @@ def showcase_unit_add_iam_methods(session):
# google-auth is a transitive dependency so it isn't in the
# lower bound constraints file produced above.
session.install("google-auth==1.21.1")
run_showcase_unit_tests(session, fail_under=0)
run_showcase_unit_tests(session)

# 2. Run the tests again with latest version of dependencies
session.install(".", "--upgrade", "--force-reinstall")
# This time aggregate coverage should reach 100%
run_showcase_unit_tests(session, fail_under=100)
run_showcase_unit_tests(session)


@nox.session(python="3.8")
Expand Down
8 changes: 4 additions & 4 deletions tests/system/test_resource_crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ def test_nonslash_resource(messaging):


def test_path_parsing(messaging):
expected = {"room_id": "tiki"}
expected = {"room": "tiki"}
actual = messaging.parse_room_path(messaging.room_path("tiki"))

assert expected == actual

expected = {
"user_id": "bdfl",
"legacy_user_id": "apocalyptic",
"blurb_id": "city",
"user": "bdfl",
"legacy_user": "apocalyptic",
"blurb": "city",
}
actual = messaging.parse_blurb_path(
messaging.blurb_path("bdfl", "apocalyptic", "city")
Expand Down