hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-13 04:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Central internal_ssl switch

Browse Source
This commit is contained in:
Omar Richardson
2020-11-20 15:27:50 +01:00
parent 09ff03ca4f
commit 0472ef0533
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jupyterhub/tests/conftest.py
View File

@@ -74,7 +74,9 @@ 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) ssl_enabled = request.module.getattr(
'ssl_enabled', os.environ.get('SSL_ENABLED', False)
)
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)))

2
jupyterhub/tests/test_api.py
View File

@@ -1,6 +1,5 @@
"""Tests for the REST API.""" """Tests for the REST API."""
import json import json
import os
import re import re
import sys import sys
import uuid import uuid
@@ -28,7 +27,6 @@ from .utils import async_requests
from .utils import auth_header from .utils import auth_header
from .utils import find_user from .utils import find_user
ssl_enabled = os.environ.get('SSL_ENABLED', False)
# -------------------- # --------------------
# Authentication tests # Authentication tests
# -------------------- # --------------------

2
jupyterhub/tests/test_app.py
View File

@@ -20,8 +20,6 @@ from ..app import JupyterHub
from .mocking import MockHub from .mocking import MockHub
from .test_api import add_user from .test_api import add_user
ssl_enabled = os.environ.get('SSL_ENABLED', False)
def test_help_all(): def test_help_all():
out = check_output([sys.executable, '-m', 'jupyterhub', '--help-all']).decode( out = check_output([sys.executable, '-m', 'jupyterhub', '--help-all']).decode(

2
jupyterhub/tests/test_spawner.py
View File

@@ -42,8 +42,6 @@ while True:
print("interrupted") print("interrupted")
""" """
ssl_enabled = os.environ.get('SSL_ENABLED', False)
def setup(): def setup():
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)