pre-commit: run black without string normalization

2025-12-18 21:54:05 +08:00 · 2021-11-01 09:42:45 +01:00
parent e75de14839
commit 771ae59636
32 changed files with 691 additions and 587 deletions
--- a/integration-tests/test_hub.py
+++ b/integration-tests/test_hub.py
@@ -33,8 +33,20 @@ async def test_user_code_execute():
    hub_url = 'http://localhost'
    username = secrets.token_hex(8)

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).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, 'set', 'auth.type', 'dummy'
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+        ).wait()
+    )

    async with User(username, hub_url, partial(login_dummy, password='')) as u:
        await u.login()
@@ -57,17 +69,48 @@ async def test_user_server_started_with_custom_base_url():
    hub_url = f"http://localhost{base_url}"
    username = secrets.token_hex(8)

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).wait()
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'base_url', base_url)).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, 'set', 'auth.type', 'dummy'
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'set', 'base_url', base_url
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+        ).wait()
+    )

    async with User(username, hub_url, partial(login_dummy, password='')) as u:
        await u.login()
        await u.ensure_server_simulate()

        # unset base_url to avoid problems with other tests
-        assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'unset', 'base_url')).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, 'unset', 'base_url'
+                )
+            ).wait()
+        )
+        assert (
+            0
+            == await (
+                await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+            ).wait()
+        )


@pytest.mark.asyncio
@@ -80,9 +123,28 @@ async def test_user_admin_add():
    hub_url = 'http://localhost'
    username = secrets.token_hex(8)

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).wait()
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'add-item', 'users.admin', 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, 'set', 'auth.type', 'dummy'
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'add-item', 'users.admin', username
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+        ).wait()
+    )

    async with User(username, hub_url, partial(login_dummy, password='')) as u:
        await u.login()
@@ -92,8 +154,7 @@ async def test_user_admin_add():
        assert pwd.getpwnam(f'jupyter-{username}') is not None

        # Assert that the user has admin rights
-        assert f'jupyter-{username}' in grp.getgrnam(
-            'jupyterhub-admins').gr_mem
+        assert f'jupyter-{username}' in grp.getgrnam('jupyterhub-admins').gr_mem


 # FIXME: Make this test pass
@@ -110,9 +171,28 @@ async def test_user_admin_remove():
    hub_url = 'http://localhost'
    username = secrets.token_hex(8)

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).wait()
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'add-item', 'users.admin', 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, 'set', 'auth.type', 'dummy'
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'add-item', 'users.admin', username
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+        ).wait()
+    )

    async with User(username, hub_url, partial(login_dummy, password='')) as u:
        await u.login()
@@ -122,18 +202,28 @@ async def test_user_admin_remove():
        assert pwd.getpwnam(f'jupyter-{username}') is not None

        # Assert that the user has admin rights
-        assert f'jupyter-{username}' in grp.getgrnam(
-            'jupyterhub-admins').gr_mem
+        assert f'jupyter-{username}' in grp.getgrnam('jupyterhub-admins').gr_mem

-        assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'remove-item', 'users.admin', 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, 'remove-item', 'users.admin', username
+                )
+            ).wait()
+        )
+        assert (
+            0
+            == await (
+                await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+            ).wait()
+        )

        await u.stop_server()
        await u.ensure_server_simulate()

        # Assert that the user does *not* have admin rights
-        assert f'jupyter-{username}' not in grp.getgrnam(
-            'jupyterhub-admins').gr_mem
+        assert f'jupyter-{username}' not in grp.getgrnam('jupyterhub-admins').gr_mem


@pytest.mark.asyncio
@@ -146,8 +236,20 @@ async def test_long_username():
    hub_url = 'http://localhost'
    username = secrets.token_hex(32)

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).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, 'set', 'auth.type', 'dummy'
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+        ).wait()
+    )

    try:
        async with User(username, hub_url, partial(login_dummy, password='')) as u:
@@ -161,11 +263,7 @@ async def test_long_username():
            await u.stop_server()
    except:
        # If we have any errors, print jupyterhub logs before exiting
-        subprocess.check_call([
-            'journalctl',
-            '-u', 'jupyterhub',
-            '--no-pager'
-        ])
+        subprocess.check_call(['journalctl', '-u', 'jupyterhub', '--no-pager'])
        raise


@@ -182,9 +280,31 @@ async def test_user_group_adding():
    # Create the group we want to add the user to
    system('groupadd somegroup')

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).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, 'set', 'auth.type', 'dummy'
+            )
+        ).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()
+    )

    try:
        async with User(username, hub_url, partial(login_dummy, password='')) as u:
@@ -203,11 +323,7 @@ async def test_user_group_adding():
            system('groupdel somegroup')
    except:
        # If we have any errors, print jupyterhub logs before exiting
-        subprocess.check_call([
-            'journalctl',
-            '-u', 'jupyterhub',
-            '--no-pager'
-        ])
+        subprocess.check_call(['journalctl', '-u', 'jupyterhub', '--no-pager'])
        raise


@@ -222,14 +338,47 @@ async def test_idle_server_culled():
    hub_url = 'http://localhost'
    username = secrets.token_hex(8)

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).wait()
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy'
+            )
+        ).wait()
+    )
    # Check every 10s for idle servers to cull
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'services.cull.every', "10")).wait()
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'set', 'services.cull.every', "10"
+            )
+        ).wait()
+    )
    # Apart from servers, also cull users
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'services.cull.users', "True")).wait()
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'set', 'services.cull.users', "True"
+            )
+        ).wait()
+    )
    # Cull servers and users after 60s of activity
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'services.cull.max_age', "60")).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, 'set', 'services.cull.max_age', "60"
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+        ).wait()
+    )

    async with User(username, hub_url, partial(login_dummy, password='')) as u:
        await u.login()
@@ -239,14 +388,18 @@ async def test_idle_server_culled():
        assert pwd.getpwnam(f'jupyter-{username}') is not None

        # Check that we can get to the user's server
-        r = await u.session.get(u.hub_url / 'hub/api/users' / username,
-                                headers={'Referer': str(u.hub_url / 'hub/')})
+        r = await u.session.get(
+            u.hub_url / 'hub/api/users' / username,
+            headers={'Referer': str(u.hub_url / 'hub/')},
+        )
        assert r.status == 200

        async def _check_culling_done():
            # Check that after 60s, the user and server have been culled and are not reacheable anymore
-            r = await u.session.get(u.hub_url / 'hub/api/users' / username,
-                                    headers={'Referer': str(u.hub_url / 'hub/')})
+            r = await u.session.get(
+                u.hub_url / 'hub/api/users' / username,
+                headers={'Referer': str(u.hub_url / 'hub/')},
+            )
            print(r.status)
            return r.status == 403

@@ -268,14 +421,47 @@ async def test_active_server_not_culled():
    hub_url = 'http://localhost'
    username = secrets.token_hex(8)

-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy')).wait()
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'set', 'auth.type', 'dummy'
+            )
+        ).wait()
+    )
    # Check every 10s for idle servers to cull
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'services.cull.every', "10")).wait()
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'set', 'services.cull.every', "10"
+            )
+        ).wait()
+    )
    # Apart from servers, also cull users
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'services.cull.users', "True")).wait()
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(
+                *TLJH_CONFIG_PATH, 'set', 'services.cull.users', "True"
+            )
+        ).wait()
+    )
    # Cull servers and users after 60s of activity
-    assert 0 == await (await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'set', 'services.cull.max_age', "60")).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, 'set', 'services.cull.max_age', "60"
+            )
+        ).wait()
+    )
+    assert (
+        0
+        == await (
+            await asyncio.create_subprocess_exec(*TLJH_CONFIG_PATH, 'reload')
+        ).wait()
+    )

    async with User(username, hub_url, partial(login_dummy, password='')) as u:
        await u.login()
@@ -285,14 +471,18 @@ async def test_active_server_not_culled():
        assert pwd.getpwnam(f'jupyter-{username}') is not None

        # Check that we can get to the user's server
-        r = await u.session.get(u.hub_url / 'hub/api/users' / username,
-                                headers={'Referer': str(u.hub_url / 'hub/')})
+        r = await u.session.get(
+            u.hub_url / 'hub/api/users' / username,
+            headers={'Referer': str(u.hub_url / 'hub/')},
+        )
        assert r.status == 200

        async def _check_culling_done():
            # Check that after 30s, we can still reach the user's server
-            r = await u.session.get(u.hub_url / 'hub/api/users' / username,
-                                    headers={'Referer': str(u.hub_url / 'hub/')})
+            r = await u.session.get(
+                u.hub_url / 'hub/api/users' / username,
+                headers={'Referer': str(u.hub_url / 'hub/')},
+            )
            print(r.status)
            return r.status != 200