mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-12 04:23:01 +00:00
Reduced ssl on for active tests only
This commit is contained in:
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@@ -94,7 +94,7 @@ jobs:
|
||||
- python: "3.7"
|
||||
db: mysql
|
||||
- python: "3.7"
|
||||
ssl: ssl_enabled
|
||||
ssl: ssl
|
||||
- python: "3.8"
|
||||
db: postgres
|
||||
- python: "3.8"
|
||||
@@ -115,7 +115,7 @@ jobs:
|
||||
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
|
||||
fi
|
||||
if [ "${{ matrix.ssl }}" == "ssl_enabled" ]; then
|
||||
if [ "${{ matrix.ssl }}" == "ssl" ]; then
|
||||
echo "SSL_ENABLED=1" >> $GITHUB_ENV
|
||||
fi
|
||||
if [ "${{ matrix.db }}" == "postgres" ]; then
|
||||
|
@@ -74,11 +74,7 @@ def ssl_tmpdir(tmpdir_factory):
|
||||
def app(request, io_loop, ssl_tmpdir):
|
||||
"""Mock a jupyterhub app for testing"""
|
||||
mocked_app = None
|
||||
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)
|
||||
ssl_enabled = getattr(request.module, "ssl_enabled", False)
|
||||
kwargs = dict()
|
||||
if ssl_enabled:
|
||||
kwargs.update(dict(internal_ssl=True, internal_certs_location=str(ssl_tmpdir)))
|
||||
|
@@ -1,5 +1,6 @@
|
||||
"""Tests for the REST API."""
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import uuid
|
||||
@@ -27,7 +28,7 @@ from .utils import async_requests
|
||||
from .utils import auth_header
|
||||
from .utils import find_user
|
||||
|
||||
|
||||
ssl_enabled = os.environ.get('SSL_ENABLED', False)
|
||||
# --------------------
|
||||
# Authentication tests
|
||||
# --------------------
|
||||
|
@@ -20,6 +20,8 @@ from ..app import JupyterHub
|
||||
from .mocking import MockHub
|
||||
from .test_api import add_user
|
||||
|
||||
ssl_enabled = os.environ.get('SSL_ENABLED', False)
|
||||
|
||||
|
||||
def test_help_all():
|
||||
out = check_output([sys.executable, '-m', 'jupyterhub', '--help-all']).decode(
|
||||
|
@@ -41,6 +41,9 @@ while True:
|
||||
except KeyboardInterrupt:
|
||||
print("interrupted")
|
||||
"""
|
||||
import os
|
||||
|
||||
ssl_enabled = os.environ.get('SSL_ENABLED', False)
|
||||
|
||||
|
||||
def setup():
|
||||
|
Reference in New Issue
Block a user