diff --git a/jupyterhub/alembic/versions/0eee8c825d24_added_properties_column.py b/jupyterhub/alembic/versions/0eee8c825d24_added_properties_column.py index d179241c..743ac32d 100644 --- a/jupyterhub/alembic/versions/0eee8c825d24_added_properties_column.py +++ b/jupyterhub/alembic/versions/0eee8c825d24_added_properties_column.py @@ -7,7 +7,7 @@ Create Date: 2021-09-15 14:04:09.067024 """ # revision identifiers, used by Alembic. revision = '0eee8c825d24' -down_revision = '833da8570507' +down_revision = '651f5419b74d' branch_labels = None depends_on = None diff --git a/jupyterhub/tests/test_app.py b/jupyterhub/tests/test_app.py index a44c64d2..80f901fa 100644 --- a/jupyterhub/tests/test_app.py +++ b/jupyterhub/tests/test_app.py @@ -234,8 +234,8 @@ def test_cookie_secret_string_(): async def test_load_groups(tmpdir, request): to_load = { - 'blue':{'users': ['cyclops', 'rogue', 'wolverine'], 'properties':{'setting1':'one', 'setting2':'two'}}, - 'gold':{'users': ['storm', 'jean-grey', 'colossus'], 'properties':{'setting3':'three', 'setting4':'four'}}, + 'blue': ['cyclops', 'rogue', 'wolverine'], + 'gold': ['storm', 'jean-grey', 'colossus'], } kwargs = {'load_groups': to_load} ssl_enabled = getattr(request.module, "ssl_enabled", False) @@ -249,11 +249,9 @@ async def test_load_groups(tmpdir, request): blue = orm.Group.find(db, name='blue') assert blue is not None assert sorted(u.name for u in blue.users) == sorted(to_load['blue']) - assert sorted(u for u in blue.properties) == sorted(to_load['blue']['properties']) gold = orm.Group.find(db, name='gold') assert gold is not None assert sorted(u.name for u in gold.users) == sorted(to_load['gold']) - assert sorted(u for u in gold.properties) == sorted(to_load['gold']['properties']) async def test_resume_spawners(tmpdir, request):