From 907d2b8f5bff116e53b9c2243ae5f2f96c9154ff Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Sat, 4 Aug 2018 10:55:25 -0700
Subject: [PATCH] Move nb/serverextension tests to own file

---
 integration-tests/test_extensions.py | 42 ++++++++++++++++++++++++++
 integration-tests/test_hub.py        | 44 +---------------------------
 2 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 integration-tests/test_extensions.py

diff --git a/integration-tests/test_extensions.py b/integration-tests/test_extensions.py
new file mode 100644
index 0000000..c57cbef
--- /dev/null
+++ b/integration-tests/test_extensions.py
@@ -0,0 +1,42 @@
+import subprocess
+
+
+def test_serverextensions():
+    """
+    Validate serverextensions we want are installed
+    """
+    # jupyter-serverextension writes to stdout and stderr weirdly
+    proc = subprocess.run([
+        '/opt/tljh/user/bin/jupyter-serverextension',
+        'list', '--sys-prefix'
+    ], stderr=subprocess.PIPE)
+
+    extensions = [
+        'jupyterlab 0.32.1',
+        'nbgitpuller 0.6.1',
+        'nteract_on_jupyter 1.8.1',
+        'nbresuse '
+    ]
+
+    for e in extensions:
+        assert '{} \x1b[32mOK\x1b[0m'.format(e) in proc.stderr.decode()
+
+def test_nbextensions():
+    """
+    Validate nbextensions we want are installed & enabled
+    """
+    # jupyter-nbextension writes to stdout and stderr weirdly
+    proc = subprocess.run([
+        '/opt/tljh/user/bin/jupyter-nbextension',
+        'list', '--sys-prefix'
+    ], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+
+    extensions = [
+        'nbresuse/main',
+    ]
+
+    for e in extensions:
+        assert '{} \x1b[32m enabled \x1b[0m'.format(e) in proc.stdout.decode()
+
+    # Ensure we have 'OK' messages in our stdout, to make sure everything is importable
+    proc.stderr.decode() == '      - Validating: \x1b[32mOK\x1b[0m\n' * len(extensions)
\ No newline at end of file
diff --git a/integration-tests/test_hub.py b/integration-tests/test_hub.py
index 8bfd365..a70028a 100644
--- a/integration-tests/test_hub.py
+++ b/integration-tests/test_hub.py
@@ -2,7 +2,6 @@ import requests
 from hubtraf.user import User
 from hubtraf.auth.dummy import login_dummy
 import secrets
-import subprocess
 import pytest
 from functools import partial
 import asyncio
@@ -105,45 +104,4 @@ async def test_user_admin_remove():
             await u.ensure_server()
 
             # Assert that the user does *not* have admin rights
-            assert f'jupyter-{username}' in grp.getgrnam('jupyterhub-admins').gr_mem
-
-
-def test_serverextensions():
-    """
-    Validate serverextensions we want are installed
-    """
-    # jupyter-serverextension writes to stdout and stderr weirdly
-    proc = subprocess.run([
-        '/opt/tljh/user/bin/jupyter-serverextension',
-        'list', '--sys-prefix'
-    ], stderr=subprocess.PIPE)
-
-    extensions = [
-        'jupyterlab 0.32.1',
-        'nbgitpuller 0.6.1',
-        'nteract_on_jupyter 1.8.1',
-        'nbresuse '
-    ]
-
-    for e in extensions:
-        assert '{} \x1b[32mOK\x1b[0m'.format(e) in proc.stderr.decode()
-
-def test_nbextensions():
-    """
-    Validate nbextensions we want are installed & enabled
-    """
-    # jupyter-nbextension writes to stdout and stderr weirdly
-    proc = subprocess.run([
-        '/opt/tljh/user/bin/jupyter-nbextension',
-        'list', '--sys-prefix'
-    ], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-
-    extensions = [
-        'nbresuse/main',
-    ]
-
-    for e in extensions:
-        assert '{} \x1b[32m enabled \x1b[0m'.format(e) in proc.stdout.decode()
-
-    # Ensure we have 'OK' messages in our stdout, to make sure everything is importable
-    proc.stderr.decode() == '      - Validating: \x1b[32mOK\x1b[0m\n' * len(extensions)
\ No newline at end of file
+            assert f'jupyter-{username}' in grp.getgrnam('jupyterhub-admins').gr_mem
\ No newline at end of file