zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed group config option

Browse Source
This commit is contained in:
GeorgianaElena
2019-06-21 11:38:26 +03:00
parent da443ebd4b
commit 88a09285d2
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/test_hub.py
View File

@@ -156,7 +156,7 @@ async def test_user_group_adding():
system('groupadd somegroup') system('groupadd somegroup')
assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummyauthenticator.DummyAuthenticator')).wait() assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummyauthenticator.DummyAuthenticator')).wait()
assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'add-item', 'users.groups.somegroup', username)).wait() assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'add-item', 'users.extra_user_groups.somegroup', username)).wait()
assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')).wait() assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')).wait()
try: try:

8
tests/test_configurer.py
View File

@@ -129,22 +129,22 @@ def test_auth_dummy():
assert c.JupyterHub.authenticator_class == 'dummyauthenticator.DummyAuthenticator' assert c.JupyterHub.authenticator_class == 'dummyauthenticator.DummyAuthenticator'
assert c.DummyAuthenticator.password == 'test' assert c.DummyAuthenticator.password == 'test'
from traitlets import Dict
def test_user_groups(): def test_user_groups():
""" """
Test setting user groups Test setting user groups
""" """
c = apply_mock_config({ c = apply_mock_config({
'users': { 'users': {
'groups': { 'extra_user_groups': {
"g1": ["u1", "u2"], "g1": ["u1", "u2"],
"g1": ["u3", "u4"] "g2": ["u3", "u4"]
}, },
} }
}) })
assert c.UserCreatingSpawner.user_groups == { assert c.UserCreatingSpawner.user_groups == {
"g1": ["u1", "u2"], "g1": ["u1", "u2"],
"g1": ["u3", "u4"] "g2": ["u3", "u4"]
} }

4
tljh/configurer.py
View File

@@ -27,7 +27,7 @@ default = {
'allowed': [], 'allowed': [],
'banned': [], 'banned': [],
'admin': [], 'admin': [],
'groups': {} 'extra_user_groups': {}
}, },
'limits': { 'limits': {
'memory': None, 'memory': None,
@@ -175,7 +175,7 @@ def update_usergroups(c, config):
Set user groups Set user groups
""" """
users = config['users'] users = config['users']
c.UserCreatingSpawner.user_groups = users['groups'] c.UserCreatingSpawner.user_groups = users['extra_user_groups']
def update_limits(c, config): def update_limits(c, config):

4
tljh/jupyterhub_config.py
View File

@@ -13,7 +13,7 @@ from tljh.normalize import generate_system_username
from tljh.yaml import yaml from tljh.yaml import yaml
from jupyterhub_traefik_proxy import TraefikTomlProxy from jupyterhub_traefik_proxy import TraefikTomlProxy
from traitlets import Any from traitlets import Dict
class UserCreatingSpawner(SystemdSpawner): class UserCreatingSpawner(SystemdSpawner):
""" """
@@ -21,7 +21,7 @@ class UserCreatingSpawner(SystemdSpawner):
FIXME: Remove this somehow? FIXME: Remove this somehow?
""" """
user_groups = Any(config=True) user_groups = Dict(config=True)
def start(self): def start(self):
""" """