Skip to content

Commit

Permalink
Attempt to fix broken tests
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed May 31, 2023
1 parent e48cd13 commit 90a99f4
Show file tree
Hide file tree
Showing 6 changed files with 182 additions and 158 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/publish.yml

This file was deleted.

54 changes: 54 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# This is a GitHub workflow defining a set of jobs with a set of steps.
# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
#
name: Release

# Always tests wheel building, but only publish to PyPI on pushed tags.
on:
pull_request:
paths-ignore:
- "docs/**"
- ".github/workflows/*.yaml"
- "!.github/workflows/release.yaml"
push:
paths-ignore:
- "docs/**"
- ".github/workflows/*.yaml"
- "!.github/workflows/release.yaml"
branches-ignore:
- "dependabot/**"
- "pre-commit-ci-update-config"
tags: ["**"]
workflow_dispatch:

jobs:
build-release:
runs-on: ubuntu-22.04
permissions:
# id-token=write is required for pypa/gh-action-pypi-publish, and the PyPI
# project needs to be configured to trust this workflow.
#
# ref: https://github.com/jupyterhub/team-compass/issues/648
#
id-token: write

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"

- name: install build package
run: |
pip install --upgrade pip
pip install build
pip freeze
- name: build release
run: |
python -m build --sdist --wheel .
ls -l dist
- name: publish to pypi
uses: pypa/gh-action-pypi-publish@release/v1
if: startsWith(github.ref, 'refs/tags/')
117 changes: 117 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
# This is a GitHub workflow defining a set of jobs with a set of steps.
# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
#
name: Tests

on:
pull_request:
paths-ignore:
- "docs/**"
- "**.md"
- ".github/workflows/*.yaml"
- "!.github/workflows/test.yaml"
push:
paths-ignore:
- "docs/**"
- "**.md"
- ".github/workflows/*.yaml"
- "!.github/workflows/test.yaml"
branches-ignore:
- "dependabot/**"
- "pre-commit-ci-update-config"
tags: ["**"]
workflow_dispatch:

jobs:
test:
runs-on: ubuntu-22.04
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
include:
- python-version: "3.7"
pip-install-spec: "jupyterhub==1.0.0 sqlalchemy==1.*"
- python-version: "3.8"
pip-install-spec: "jupyterhub==2.* sqlalchemy==1.*"
- python-version: "3.9"
pip-install-spec: "jupyterhub==3.*"
- python-version: "3.11"
pip-install-spec: "jupyterhub==4.*"
- python-version: "3.11"
pip-install-spec: "jupyterhub==4.*"
test-variation: internal-ssl
- python-version: "3.11"
pip-install-spec: "jupyterhub==4.*"
test-variation: podman

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-node@v3
with:
node-version: "18"

- name: setup docker swarm
run: docker swarm init

- name: Install Python dependencies
run: |
pip install ${{ matrix.pip-install-spec }}
pip install -e "." -r dev-requirements.txt
- name: List Python dependencies
run: |
pip freeze
- name: Install Node dependencies
run: |
npm install -g configurable-http-proxy
- name: Run tests
if: matrix.test-variation == ''
run: |
pytest tests --cov=dockerspawner
- name: Run examples/internal-ssl tests
if: matrix.test-variation == 'internal-ssl'
# FIXME: --cov=dockerspawner is omitted as the tested code lives inside
# the built dockerspawner image, so --cov=dockerspawner
# referencing the local source code doesn't get us test coverage.
#
run: |
pytest examples/internal-ssl --capture=no
- name: Prepare for user-mode podman tests
if: matrix.test-variation == 'podman'
# Podman's system service is started as a user managed process
# (user-mode / rootless), and the docker-api provided by podman is used
# by setting DOCKER_HOST to the podman provided docker-api.
#
# ref: https://docs.podman.io/en/latest/markdown/podman-system-service.1.html
# ref: https://docker-py.readthedocs.io/en/stable/client.html#envvar-DOCKER_HOST
#
run: |
# Default is unix://$XDG_RUNTIME_DIR/podman/podman.sock but XDG_RUNTIME_DIR may not be set
export DOCKER_HOST=unix://$HOME/podman.sock
podman system service --time=0 $DOCKER_HOST &
for n in $(seq 1 10); do
if ! docker version &>/dev/null; then
echo "podman system service - starting..."
sleep 1
else
echo "podman system service - started!"
echo ""
break
fi
done
pytest tests/test_dockerspawner.py --cov=dockerspawner
# GitHub action reference: https://github.com/codecov/codecov-action
- uses: codecov/codecov-action@v3
117 changes: 0 additions & 117 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 0 additions & 2 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
codecov
netifaces
notebook<7
pyflakes
pytest>=3.6
pytest-asyncio
pytest-cov
15 changes: 11 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ profile = "black"
[tool.black]
skip-string-normalization = true
target_version = [
"py36",
"py37",
"py38",
"py39",
Expand All @@ -27,7 +26,15 @@ target_version = [
# ref: https://docs.pytest.org/en/stable/
#
[tool.pytest.ini_options]
addopts = "--verbose --color=yes --durations=10"
addopts = "--verbose --color=yes --durations=10 --maxfail=2"
asyncio_mode = "auto"
# Ignore thousands of tests in dependencies installed in a virtual environment
norecursedirs = "lib lib64"
testpaths = ["tests"]
# These markers are registered to avoid warnings triggered by importing from
# jupyterhub.tests.test_api.
markers = [
"role",
"user",
"slow",
"group",
"services",
]

0 comments on commit 90a99f4

Please sign in to comment.