hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-12 20:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving ssl tests to testing matrix

Browse Source
This commit is contained in:
Omar Richardson
2020-11-19 11:59:03 +01:00
parent 5bcbc8b328
commit c46beb976a
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/test.yml vendored
View File

@@ -77,6 +77,10 @@ jobs:
# Tests everything when the user instances are started with # Tests everything when the user instances are started with
# jupyter_server instead of notebook. # jupyter_server instead of notebook.
# #
# ssl:
# Tests everything using internal SSL connections instead of
# unencrypted HTTP
#
# main_dependencies: # main_dependencies:
# Tests everything when the we use the latest available dependencies # Tests everything when the we use the latest available dependencies
# from: ipytraitlets. # from: ipytraitlets.
@@ -91,6 +95,7 @@ jobs:
db: mysql db: mysql
- python: "3.8" - python: "3.8"
db: postgres db: postgres
ssl: enabled
- python: "3.8" - python: "3.8"
jupyter_server: jupyter_server jupyter_server: jupyter_server
- python: "3.9" - python: "3.9"
@@ -109,6 +114,9 @@ jobs:
echo "MYSQL_HOST=127.0.0.1" >> $GITHUB_ENV echo "MYSQL_HOST=127.0.0.1" >> $GITHUB_ENV
echo "JUPYTERHUB_TEST_DB_URL=mysql+mysqlconnector://root@127.0.0.1:3306/jupyterhub" >> $GITHUB_ENV echo "JUPYTERHUB_TEST_DB_URL=mysql+mysqlconnector://root@127.0.0.1:3306/jupyterhub" >> $GITHUB_ENV
fi fi
if [ "${{ matrix.ssl }}" == "enabled" ]; then
echo "SSL_ENABLED=1" >> $GITHUB_ENV
fi
if [ "${{ matrix.db }}" == "postgres" ]; then if [ "${{ matrix.db }}" == "postgres" ]; then
echo "PGHOST=127.0.0.1" >> $GITHUB_ENV echo "PGHOST=127.0.0.1" >> $GITHUB_ENV
echo "PGUSER=test_user" >> $GITHUB_ENV echo "PGUSER=test_user" >> $GITHUB_ENV

6
jupyterhub/tests/conftest.py
View File

@@ -74,7 +74,11 @@ def ssl_tmpdir(tmpdir_factory):
def app(request, io_loop, ssl_tmpdir): def app(request, io_loop, ssl_tmpdir):
"""Mock a jupyterhub app for testing""" """Mock a jupyterhub app for testing"""
mocked_app = None mocked_app = None
ssl_enabled = getattr(request.module, "ssl_enabled", False) if 'SSL_ENABLED' in os.environ:
ssl_env_var = bool(os.environ['SSL_ENABLED'])
else:
ssl_env_var = False
ssl_enabled = getattr(request.module, "ssl_enabled", ssl_env_var)
kwargs = dict() kwargs = dict()
if ssl_enabled: if ssl_enabled:
kwargs.update(dict(internal_ssl=True, internal_certs_location=str(ssl_tmpdir))) kwargs.update(dict(internal_ssl=True, internal_certs_location=str(ssl_tmpdir)))

6
jupyterhub/tests/test_internal_ssl_api.py
View File

@@ -1,6 +0,0 @@
"""Tests for the SSL enabled REST API."""
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from jupyterhub.tests.test_api import *
ssl_enabled = True

7
jupyterhub/tests/test_internal_ssl_app.py
View File

@@ -1,7 +0,0 @@
"""Test the JupyterHub entry point with internal ssl"""
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import jupyterhub.tests.mocking
from jupyterhub.tests.test_app import *
ssl_enabled = True

6
jupyterhub/tests/test_internal_ssl_spawner.py
View File

@@ -1,6 +0,0 @@
"""Tests for process spawning with internal_ssl"""
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from jupyterhub.tests.test_spawner import *
ssl_enabled = True