From 5ba9f26dcc70b2d2608ab2a09184d945f77532ae Mon Sep 17 00:00:00 2001
From: "Afshin T. Darian" <git@darian.af>
Date: Thu, 18 Feb 2021 15:45:46 +0000
Subject: [PATCH] Add Tests to Distribution

---
 .github/workflows/python-linux.yml            | 12 ++++++++++
 .github/workflows/python-macos.yml            |  6 +++++
 .github/workflows/python-windows.yml          |  2 +-
 README.md                                     |  9 +++++++-
 {tests => jupyter_server/tests}/__init__.py   |  0
 .../tests}/auth/__init__.py                   |  0
 .../tests}/auth/test_login.py                 |  0
 .../tests}/auth/test_security.py              |  0
 {tests => jupyter_server/tests}/conftest.py   |  0
 .../tests}/extension/__init__.py              |  0
 .../tests}/extension/conftest.py              |  0
 .../extension/mockextensions/__init__.py      |  8 +++----
 .../tests}/extension/mockextensions/app.py    |  0
 .../tests}/extension/mockextensions/mock1.py  |  2 +-
 .../tests}/extension/mockextensions/mock2.py  |  2 +-
 .../tests}/extension/mockextensions/mock3.py  |  0
 .../extension/mockextensions/mockext_both.py  |  2 +-
 .../extension/mockextensions/mockext_py.py    |  2 +-
 .../extension/mockextensions/mockext_sys.py   |  2 +-
 .../extension/mockextensions/mockext_user.py  |  2 +-
 .../extension/mockextensions/static/mock.txt  |  0
 .../tests}/extension/test_app.py              |  4 ++--
 .../tests}/extension/test_config.py           |  0
 .../tests}/extension/test_entrypoint.py       |  0
 .../tests}/extension/test_handler.py          |  6 ++---
 .../tests}/extension/test_launch.py           |  2 +-
 .../tests}/extension/test_manager.py          |  8 +++----
 .../tests}/extension/test_serverextension.py  | 22 +++++++++----------
 .../tests}/extension/test_utils.py            |  8 +++----
 .../tests}/nbconvert/__init__.py              |  0
 .../tests}/nbconvert/test_handlers.py         |  0
 .../tests}/services/__init__.py               |  0
 .../tests}/services/api/__init__.py           |  0
 .../tests}/services/api/test_api.py           |  0
 .../tests}/services/config/__init__.py        |  0
 .../tests}/services/config/test_api.py        |  0
 .../tests}/services/contents/__init__.py      |  0
 .../tests}/services/contents/test_api.py      |  0
 .../tests}/services/contents/test_config.py   |  0
 .../tests}/services/contents/test_fileio.py   |  0
 .../contents/test_largefilemanager.py         |  0
 .../tests}/services/contents/test_manager.py  |  0
 .../tests}/services/kernels/__init__.py       |  0
 .../tests}/services/kernels/test_api.py       |  0
 .../tests}/services/kernels/test_config.py    |  0
 .../tests}/services/kernels/test_cull.py      |  0
 .../tests}/services/kernelspecs/__init__.py   |  0
 .../tests}/services/kernelspecs/test_api.py   |  0
 .../tests}/services/nbconvert/__init__.py     |  0
 .../tests}/services/nbconvert/test_api.py     |  0
 .../tests}/services/sessions/__init__.py      |  0
 .../tests}/services/sessions/test_api.py      |  0
 .../tests}/services/sessions/test_manager.py  |  0
 .../tests}/test_config_manager.py             |  0
 {tests => jupyter_server/tests}/test_files.py |  0
 .../tests}/test_gateway.py                    |  0
 {tests => jupyter_server/tests}/test_paths.py |  0
 .../tests}/test_serialize.py                  |  0
 .../tests}/test_serverapp.py                  |  0
 .../tests}/test_terminal.py                   |  0
 .../tests}/test_traittypes.py                 |  0
 {tests => jupyter_server/tests}/test_utils.py |  0
 .../tests}/test_version.py                    |  0
 {tests => jupyter_server/tests}/test_view.py  |  0
 {tests => jupyter_server/tests}/utils.py      |  0
 pytest.ini                                    |  2 ++
 66 files changed, 64 insertions(+), 37 deletions(-)
 rename {tests => jupyter_server/tests}/__init__.py (100%)
 rename {tests => jupyter_server/tests}/auth/__init__.py (100%)
 rename {tests => jupyter_server/tests}/auth/test_login.py (100%)
 rename {tests => jupyter_server/tests}/auth/test_security.py (100%)
 rename {tests => jupyter_server/tests}/conftest.py (100%)
 rename {tests => jupyter_server/tests}/extension/__init__.py (100%)
 rename {tests => jupyter_server/tests}/extension/conftest.py (100%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/__init__.py (55%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/app.py (100%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/mock1.py (78%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/mock2.py (78%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/mock3.py (100%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/mockext_both.py (77%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/mockext_py.py (77%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/mockext_sys.py (77%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/mockext_user.py (77%)
 rename {tests => jupyter_server/tests}/extension/mockextensions/static/mock.txt (100%)
 rename {tests => jupyter_server/tests}/extension/test_app.py (93%)
 rename {tests => jupyter_server/tests}/extension/test_config.py (100%)
 rename {tests => jupyter_server/tests}/extension/test_entrypoint.py (100%)
 rename {tests => jupyter_server/tests}/extension/test_handler.py (92%)
 rename {tests => jupyter_server/tests}/extension/test_launch.py (97%)
 rename {tests => jupyter_server/tests}/extension/test_manager.py (89%)
 rename {tests => jupyter_server/tests}/extension/test_serverextension.py (78%)
 rename {tests => jupyter_server/tests}/extension/test_utils.py (54%)
 rename {tests => jupyter_server/tests}/nbconvert/__init__.py (100%)
 rename {tests => jupyter_server/tests}/nbconvert/test_handlers.py (100%)
 rename {tests => jupyter_server/tests}/services/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/api/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/api/test_api.py (100%)
 rename {tests => jupyter_server/tests}/services/config/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/config/test_api.py (100%)
 rename {tests => jupyter_server/tests}/services/contents/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/contents/test_api.py (100%)
 rename {tests => jupyter_server/tests}/services/contents/test_config.py (100%)
 rename {tests => jupyter_server/tests}/services/contents/test_fileio.py (100%)
 rename {tests => jupyter_server/tests}/services/contents/test_largefilemanager.py (100%)
 rename {tests => jupyter_server/tests}/services/contents/test_manager.py (100%)
 rename {tests => jupyter_server/tests}/services/kernels/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/kernels/test_api.py (100%)
 rename {tests => jupyter_server/tests}/services/kernels/test_config.py (100%)
 rename {tests => jupyter_server/tests}/services/kernels/test_cull.py (100%)
 rename {tests => jupyter_server/tests}/services/kernelspecs/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/kernelspecs/test_api.py (100%)
 rename {tests => jupyter_server/tests}/services/nbconvert/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/nbconvert/test_api.py (100%)
 rename {tests => jupyter_server/tests}/services/sessions/__init__.py (100%)
 rename {tests => jupyter_server/tests}/services/sessions/test_api.py (100%)
 rename {tests => jupyter_server/tests}/services/sessions/test_manager.py (100%)
 rename {tests => jupyter_server/tests}/test_config_manager.py (100%)
 rename {tests => jupyter_server/tests}/test_files.py (100%)
 rename {tests => jupyter_server/tests}/test_gateway.py (100%)
 rename {tests => jupyter_server/tests}/test_paths.py (100%)
 rename {tests => jupyter_server/tests}/test_serialize.py (100%)
 rename {tests => jupyter_server/tests}/test_serverapp.py (100%)
 rename {tests => jupyter_server/tests}/test_terminal.py (100%)
 rename {tests => jupyter_server/tests}/test_traittypes.py (100%)
 rename {tests => jupyter_server/tests}/test_utils.py (100%)
 rename {tests => jupyter_server/tests}/test_version.py (100%)
 rename {tests => jupyter_server/tests}/test_view.py (100%)
 rename {tests => jupyter_server/tests}/utils.py (100%)

diff --git a/.github/workflows/python-linux.yml b/.github/workflows/python-linux.yml
index 8eb4c6aba6..bc88a81eeb 100644
--- a/.github/workflows/python-linux.yml
+++ b/.github/workflows/python-linux.yml
@@ -43,8 +43,13 @@ jobs:
         pip freeze
         pip check
     - name: Run the tests
+      if: ${{ matrix.python-version != 'pypy3' }}
       run: |
         pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered
+    - name: Run the tests on pypy
+      if: ${{ matrix.python-version == 'pypy3' }}
+      run: |
+        pytest -vv
     - name: Install the Python dependencies for the examples
       run: |
         cd examples/simple && pip install -e .
@@ -52,5 +57,12 @@ jobs:
       run: |
         pytest examples/simple/tests/test_handlers.py
     - name: Coverage
+      if: ${{ matrix.python-version != 'pypy3' }}
       run: |
         codecov
+    - name: Test full install
+      run: |
+            pip uninstall -y jupyter_server
+            pip install .
+            cd /tmp
+            pytest --pyargs jupyter_server
diff --git a/.github/workflows/python-macos.yml b/.github/workflows/python-macos.yml
index 6d641e3081..502efbe25a 100644
--- a/.github/workflows/python-macos.yml
+++ b/.github/workflows/python-macos.yml
@@ -43,8 +43,13 @@ jobs:
         pip freeze
         pip check
     - name: Run the tests
+      if: ${{ matrix.python-version != 'pypy3' }}
       run: |
         pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered
+    - name: Run the tests on pypy
+      if: ${{ matrix.python-version == 'pypy3' }}
+      run: |
+        pytest -vv
     - name: Install the Python dependencies for the examples
       run: |
         cd examples/simple && pip install -e .
@@ -52,5 +57,6 @@ jobs:
       run: |
         pytest examples/simple/tests/test_handlers.py
     - name: Coverage
+      if: ${{ matrix.python-version != 'pypy3' }}
       run: |
         codecov
diff --git a/.github/workflows/python-windows.yml b/.github/workflows/python-windows.yml
index 5e7cb06693..7a1d7d4f85 100644
--- a/.github/workflows/python-windows.yml
+++ b/.github/workflows/python-windows.yml
@@ -37,7 +37,7 @@ jobs:
           ${{ runner.os }}-pip-
     - name: Install the Python dependencies
       run: |
-        pip install -e .[test] codecov
+        pip install -e .[test]
     - name: List installed packages
       run: |
         pip freeze
diff --git a/README.md b/README.md
index cae4314c3a..6b1393c93b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ To install the latest release locally, make sure you have
 
     $ pip install jupyter_server
 
-Jupyter Server currently supports Python>=3.5 on Linux, OSX and Windows.
+Jupyter Server currently supports Python>=3.6 on Linux, OSX and Windows.
 
 ### Versioning and Branches
 
@@ -33,6 +33,13 @@ Launch with:
 
     $ jupyter server
 
+### Testing
+
+To test an installed `jupyter_server`, run the following:
+
+    $ pip install jupyter_server[test]
+    $ pytest --pyargs jupyter_server
+
 ## Contributing
 
 If you are interested in contributing to the project, see [`CONTRIBUTING.rst`](CONTRIBUTING.rst).
diff --git a/tests/__init__.py b/jupyter_server/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to jupyter_server/tests/__init__.py
diff --git a/tests/auth/__init__.py b/jupyter_server/tests/auth/__init__.py
similarity index 100%
rename from tests/auth/__init__.py
rename to jupyter_server/tests/auth/__init__.py
diff --git a/tests/auth/test_login.py b/jupyter_server/tests/auth/test_login.py
similarity index 100%
rename from tests/auth/test_login.py
rename to jupyter_server/tests/auth/test_login.py
diff --git a/tests/auth/test_security.py b/jupyter_server/tests/auth/test_security.py
similarity index 100%
rename from tests/auth/test_security.py
rename to jupyter_server/tests/auth/test_security.py
diff --git a/tests/conftest.py b/jupyter_server/tests/conftest.py
similarity index 100%
rename from tests/conftest.py
rename to jupyter_server/tests/conftest.py
diff --git a/tests/extension/__init__.py b/jupyter_server/tests/extension/__init__.py
similarity index 100%
rename from tests/extension/__init__.py
rename to jupyter_server/tests/extension/__init__.py
diff --git a/tests/extension/conftest.py b/jupyter_server/tests/extension/conftest.py
similarity index 100%
rename from tests/extension/conftest.py
rename to jupyter_server/tests/extension/conftest.py
diff --git a/tests/extension/mockextensions/__init__.py b/jupyter_server/tests/extension/mockextensions/__init__.py
similarity index 55%
rename from tests/extension/mockextensions/__init__.py
rename to jupyter_server/tests/extension/mockextensions/__init__.py
index 5e41c308d8..8b56df64db 100644
--- a/tests/extension/mockextensions/__init__.py
+++ b/jupyter_server/tests/extension/mockextensions/__init__.py
@@ -9,16 +9,16 @@
 def _jupyter_server_extension_points():
     return [
         {
-            'module': 'tests.extension.mockextensions.app',
+            'module': 'jupyter_server.tests.extension.mockextensions.app',
             'app': MockExtensionApp
         },
         {
-            'module': 'tests.extension.mockextensions.mock1'
+            'module': 'jupyter_server.tests.extension.mockextensions.mock1'
         },
         {
-            'module': 'tests.extension.mockextensions.mock2'
+            'module': 'jupyter_server.tests.extension.mockextensions.mock2'
         },
         {
-            'module': 'tests.extension.mockextensions.mock3'
+            'module': 'jupyter_server.tests.extension.mockextensions.mock3'
         }
     ]
diff --git a/tests/extension/mockextensions/app.py b/jupyter_server/tests/extension/mockextensions/app.py
similarity index 100%
rename from tests/extension/mockextensions/app.py
rename to jupyter_server/tests/extension/mockextensions/app.py
diff --git a/tests/extension/mockextensions/mock1.py b/jupyter_server/tests/extension/mockextensions/mock1.py
similarity index 78%
rename from tests/extension/mockextensions/mock1.py
rename to jupyter_server/tests/extension/mockextensions/mock1.py
index 9c83271b7f..5de188c425 100644
--- a/tests/extension/mockextensions/mock1.py
+++ b/jupyter_server/tests/extension/mockextensions/mock1.py
@@ -6,7 +6,7 @@
 def _jupyter_server_extension_paths():
     return [
         {
-            'module': 'tests.extension.mockextensions.mock1'
+            'module': 'jupyter_server.tests.extension.mockextensions.mock1'
         }
     ]
 
diff --git a/tests/extension/mockextensions/mock2.py b/jupyter_server/tests/extension/mockextensions/mock2.py
similarity index 78%
rename from tests/extension/mockextensions/mock2.py
rename to jupyter_server/tests/extension/mockextensions/mock2.py
index 1e44bff706..d7e8d5de1b 100644
--- a/tests/extension/mockextensions/mock2.py
+++ b/jupyter_server/tests/extension/mockextensions/mock2.py
@@ -6,7 +6,7 @@
 def _jupyter_server_extension_paths():
     return [
         {
-            'module': 'tests.extension.mockextensions.mock2'
+            'module': 'jupyter_server.tests.extension.mockextensions.mock2'
         }
     ]
 
diff --git a/tests/extension/mockextensions/mock3.py b/jupyter_server/tests/extension/mockextensions/mock3.py
similarity index 100%
rename from tests/extension/mockextensions/mock3.py
rename to jupyter_server/tests/extension/mockextensions/mock3.py
diff --git a/tests/extension/mockextensions/mockext_both.py b/jupyter_server/tests/extension/mockextensions/mockext_both.py
similarity index 77%
rename from tests/extension/mockextensions/mockext_both.py
rename to jupyter_server/tests/extension/mockextensions/mockext_both.py
index 6fe762cc7f..5346ae3c95 100644
--- a/tests/extension/mockextensions/mockext_both.py
+++ b/jupyter_server/tests/extension/mockextensions/mockext_both.py
@@ -7,7 +7,7 @@
 def _jupyter_server_extension_paths():
     return [
         {
-            'module': 'tests.extension.mockextensions.mockext_both'
+            'module': 'jupyter_server.tests.extension.mockextensions.mockext_both'
         }
     ]
 
diff --git a/tests/extension/mockextensions/mockext_py.py b/jupyter_server/tests/extension/mockextensions/mockext_py.py
similarity index 77%
rename from tests/extension/mockextensions/mockext_py.py
rename to jupyter_server/tests/extension/mockextensions/mockext_py.py
index 9f40b7725b..7376438678 100644
--- a/tests/extension/mockextensions/mockext_py.py
+++ b/jupyter_server/tests/extension/mockextensions/mockext_py.py
@@ -7,7 +7,7 @@
 def _jupyter_server_extension_paths():
     return [
         {
-            'module': 'tests.extension.mockextensions.mockext_py'
+            'module': 'jupyter_server.tests.extension.mockextensions.mockext_py'
         }
     ]
 
diff --git a/tests/extension/mockextensions/mockext_sys.py b/jupyter_server/tests/extension/mockextensions/mockext_sys.py
similarity index 77%
rename from tests/extension/mockextensions/mockext_sys.py
rename to jupyter_server/tests/extension/mockextensions/mockext_sys.py
index f5504790b0..915b0f6254 100644
--- a/tests/extension/mockextensions/mockext_sys.py
+++ b/jupyter_server/tests/extension/mockextensions/mockext_sys.py
@@ -7,7 +7,7 @@
 def _jupyter_server_extension_paths():
     return [
         {
-            'module': 'tests.extension.mockextensions.mockext_sys'
+            'module': 'jupyter_server.tests.extension.mockextensions.mockext_sys'
         }
     ]
 
diff --git a/tests/extension/mockextensions/mockext_user.py b/jupyter_server/tests/extension/mockextensions/mockext_user.py
similarity index 77%
rename from tests/extension/mockextensions/mockext_user.py
rename to jupyter_server/tests/extension/mockextensions/mockext_user.py
index f078b587d7..b234ea6c50 100644
--- a/tests/extension/mockextensions/mockext_user.py
+++ b/jupyter_server/tests/extension/mockextensions/mockext_user.py
@@ -7,7 +7,7 @@
 def _jupyter_server_extension_paths():
     return [
         {
-            'module': 'tests.extension.mockextensions.mockext_user'
+            'module': 'jupyter_server.tests.extension.mockextensions.mockext_user'
         }
     ]
 
diff --git a/tests/extension/mockextensions/static/mock.txt b/jupyter_server/tests/extension/mockextensions/static/mock.txt
similarity index 100%
rename from tests/extension/mockextensions/static/mock.txt
rename to jupyter_server/tests/extension/mockextensions/static/mock.txt
diff --git a/tests/extension/test_app.py b/jupyter_server/tests/extension/test_app.py
similarity index 93%
rename from tests/extension/test_app.py
rename to jupyter_server/tests/extension/test_app.py
index 46051627ce..e86a610951 100644
--- a/tests/extension/test_app.py
+++ b/jupyter_server/tests/extension/test_app.py
@@ -7,7 +7,7 @@ def jp_server_config(jp_template_dir):
     config = {
         "ServerApp": {
             "jpserver_extensions": {
-                "tests.extension.mockextensions": True
+                "jupyter_server.tests.extension.mockextensions": True
             },
         },
         "MockExtensionApp": {
@@ -22,7 +22,7 @@ def jp_server_config(jp_template_dir):
 
 @pytest.fixture
 def mock_extension(extension_manager):
-    name = "tests.extension.mockextensions"
+    name = "jupyter_server.tests.extension.mockextensions"
     pkg = extension_manager.extensions[name]
     point = pkg.extension_points["mockextension"]
     app = point.app
diff --git a/tests/extension/test_config.py b/jupyter_server/tests/extension/test_config.py
similarity index 100%
rename from tests/extension/test_config.py
rename to jupyter_server/tests/extension/test_config.py
diff --git a/tests/extension/test_entrypoint.py b/jupyter_server/tests/extension/test_entrypoint.py
similarity index 100%
rename from tests/extension/test_entrypoint.py
rename to jupyter_server/tests/extension/test_entrypoint.py
diff --git a/tests/extension/test_handler.py b/jupyter_server/tests/extension/test_handler.py
similarity index 92%
rename from tests/extension/test_handler.py
rename to jupyter_server/tests/extension/test_handler.py
index 1e4a47c78a..7084c0804c 100644
--- a/tests/extension/test_handler.py
+++ b/jupyter_server/tests/extension/test_handler.py
@@ -6,7 +6,7 @@ def jp_server_config(jp_template_dir):
     return {
             "ServerApp": {
                 "jpserver_extensions": {
-                    "tests.extension.mockextensions": True
+                    "jupyter_server.tests.extension.mockextensions": True
                 }
             },
             "MockExtensionApp": {
@@ -40,7 +40,7 @@ async def test_handler_template(jp_fetch, mock_template):
         {
             "ServerApp": {
                 "jpserver_extensions": {
-                    "tests.extension.mockextensions": True
+                    "jupyter_server.tests.extension.mockextensions": True
                 }
             },
             "MockExtensionApp": {
@@ -81,7 +81,7 @@ async def test_handler_argv(jp_fetch, jp_argv):
             {
                 "ServerApp": {
                     "jpserver_extensions": {
-                        "tests.extension.mockextensions": True
+                        "jupyter_server.tests.extension.mockextensions": True
                     },
                     # Move extension handlers behind a url prefix
                     "base_url": "test_prefix"
diff --git a/tests/extension/test_launch.py b/jupyter_server/tests/extension/test_launch.py
similarity index 97%
rename from tests/extension/test_launch.py
rename to jupyter_server/tests/extension/test_launch.py
index 55deb2ac11..5056d9a6a6 100644
--- a/tests/extension/test_launch.py
+++ b/jupyter_server/tests/extension/test_launch.py
@@ -61,7 +61,7 @@ def _kill_extension_app():
             f'--port={port}',
             '--ip=127.0.0.1',
             '--no-browser',
-            f'--ServerApp.token={token}',
+            f'--ServerApp.token="{token}"',
             *argv,
         ], cwd=HERE)
 
diff --git a/tests/extension/test_manager.py b/jupyter_server/tests/extension/test_manager.py
similarity index 89%
rename from tests/extension/test_manager.py
rename to jupyter_server/tests/extension/test_manager.py
index e9f02f9eee..24da92b6bc 100644
--- a/tests/extension/test_manager.py
+++ b/jupyter_server/tests/extension/test_manager.py
@@ -54,7 +54,7 @@ def test_extension_package_api():
     path1 = metadata_list[0]
     app = path1["app"]
 
-    e = ExtensionPackage(name='tests.extension.mockextensions')
+    e = ExtensionPackage(name='jupyter_server.tests.extension.mockextensions')
     e.extension_points
     assert hasattr(e, "extension_points")
     assert len(e.extension_points) == len(metadata_list)
@@ -68,16 +68,16 @@ def test_extension_package_notfound_error():
 
 def test_extension_manager_api():
     jpserver_extensions = {
-        "tests.extension.mockextensions": True
+        "jupyter_server.tests.extension.mockextensions": True
     }
     manager = ExtensionManager()
     manager.from_jpserver_extensions(jpserver_extensions)
     assert len(manager.extensions) == 1
-    assert "tests.extension.mockextensions" in manager.extensions
+    assert "jupyter_server.tests.extension.mockextensions" in manager.extensions
 
 
 def test_extension_manager_linked_extensions(jp_serverapp):
-    name = "tests.extension.mockextensions"
+    name = "jupyter_server.tests.extension.mockextensions"
     manager = ExtensionManager()
     manager.add_extension(name, enabled=True)
     manager.link_extension(name, jp_serverapp)
diff --git a/tests/extension/test_serverextension.py b/jupyter_server/tests/extension/test_serverextension.py
similarity index 78%
rename from tests/extension/test_serverextension.py
rename to jupyter_server/tests/extension/test_serverextension.py
index 2034d3279f..6ee78684c8 100644
--- a/tests/extension/test_serverextension.py
+++ b/jupyter_server/tests/extension/test_serverextension.py
@@ -51,12 +51,12 @@ def test_merge_config(
     # Toggle each extension module with a JSON config file
     # at the sys-prefix config dir.
     toggle_server_extension_python(
-        'tests.extension.mockextensions.mockext_sys',
+        'jupyter_server.tests.extension.mockextensions.mockext_sys',
         enabled=True,
         sys_prefix=True
     )
     toggle_server_extension_python(
-        'tests.extension.mockextensions.mockext_user',
+        'jupyter_server.tests.extension.mockextensions.mockext_user',
         enabled=True,
         user=True
     )
@@ -65,18 +65,18 @@ def test_merge_config(
     # sys-prefix supercedes users, so the extension should be disabled
     # when these two configs merge.
     toggle_server_extension_python(
-        'tests.extension.mockextensions.mockext_both',
+        'jupyter_server.tests.extension.mockextensions.mockext_both',
         enabled=True,
         sys_prefix=True
     )
     toggle_server_extension_python(
-        'tests.extension.mockextensions.mockext_both',
+        'jupyter_server.tests.extension.mockextensions.mockext_both',
         enabled=False,
         user=True
     )
 
     arg = "--ServerApp.jpserver_extensions={{'{mockext_py}': True}}".format(
-        mockext_py='tests.extension.mockextensions.mockext_py'
+        mockext_py='jupyter_server.tests.extension.mockextensions.mockext_py'
     )
 
     # Enable the last extension, mockext_py, using the CLI interface.
@@ -86,11 +86,11 @@ def test_merge_config(
     )
     # Verify that extensions are enabled and merged in proper order.
     extensions = app.jpserver_extensions
-    assert extensions['tests.extension.mockextensions.mockext_user']
-    assert extensions['tests.extension.mockextensions.mockext_sys']
-    assert extensions['tests.extension.mockextensions.mockext_py']
+    assert extensions['jupyter_server.tests.extension.mockextensions.mockext_user']
+    assert extensions['jupyter_server.tests.extension.mockextensions.mockext_sys']
+    assert extensions['jupyter_server.tests.extension.mockextensions.mockext_py']
     # Merging should causes this extension to be disabled.
-    assert not extensions['tests.extension.mockextensions.mockext_both']
+    assert not extensions['jupyter_server.tests.extension.mockextensions.mockext_both']
 
 
 @pytest.mark.parametrize(
@@ -99,8 +99,8 @@ def test_merge_config(
         {
             "ServerApp": {
                 "jpserver_extensions": OrderedDict([
-                    ('tests.extension.mockextensions.mock2', True),
-                    ('tests.extension.mockextensions.mock1', True)
+                    ('jupyter_server.tests.extension.mockextensions.mock2', True),
+                    ('jupyter_server.tests.extension.mockextensions.mock1', True)
                 ])
             }
         }
diff --git a/tests/extension/test_utils.py b/jupyter_server/tests/extension/test_utils.py
similarity index 54%
rename from tests/extension/test_utils.py
rename to jupyter_server/tests/extension/test_utils.py
index b0afbc4f0a..7e228e5cac 100644
--- a/tests/extension/test_utils.py
+++ b/jupyter_server/tests/extension/test_utils.py
@@ -10,10 +10,10 @@
 
 def test_validate_extension():
     # enabled at sys level
-    assert validate_extension('tests.extension.mockextensions.mockext_sys')
+    assert validate_extension('jupyter_server.tests.extension.mockextensions.mockext_sys')
     # enabled at sys, disabled at user
-    assert validate_extension('tests.extension.mockextensions.mockext_both')
+    assert validate_extension('jupyter_server.tests.extension.mockextensions.mockext_both')
     # enabled at user
-    assert validate_extension('tests.extension.mockextensions.mockext_user')
+    assert validate_extension('jupyter_server.tests.extension.mockextensions.mockext_user')
     # enabled at Python
-    assert validate_extension('tests.extension.mockextensions.mockext_py')
\ No newline at end of file
+    assert validate_extension('jupyter_server.tests.extension.mockextensions.mockext_py')
\ No newline at end of file
diff --git a/tests/nbconvert/__init__.py b/jupyter_server/tests/nbconvert/__init__.py
similarity index 100%
rename from tests/nbconvert/__init__.py
rename to jupyter_server/tests/nbconvert/__init__.py
diff --git a/tests/nbconvert/test_handlers.py b/jupyter_server/tests/nbconvert/test_handlers.py
similarity index 100%
rename from tests/nbconvert/test_handlers.py
rename to jupyter_server/tests/nbconvert/test_handlers.py
diff --git a/tests/services/__init__.py b/jupyter_server/tests/services/__init__.py
similarity index 100%
rename from tests/services/__init__.py
rename to jupyter_server/tests/services/__init__.py
diff --git a/tests/services/api/__init__.py b/jupyter_server/tests/services/api/__init__.py
similarity index 100%
rename from tests/services/api/__init__.py
rename to jupyter_server/tests/services/api/__init__.py
diff --git a/tests/services/api/test_api.py b/jupyter_server/tests/services/api/test_api.py
similarity index 100%
rename from tests/services/api/test_api.py
rename to jupyter_server/tests/services/api/test_api.py
diff --git a/tests/services/config/__init__.py b/jupyter_server/tests/services/config/__init__.py
similarity index 100%
rename from tests/services/config/__init__.py
rename to jupyter_server/tests/services/config/__init__.py
diff --git a/tests/services/config/test_api.py b/jupyter_server/tests/services/config/test_api.py
similarity index 100%
rename from tests/services/config/test_api.py
rename to jupyter_server/tests/services/config/test_api.py
diff --git a/tests/services/contents/__init__.py b/jupyter_server/tests/services/contents/__init__.py
similarity index 100%
rename from tests/services/contents/__init__.py
rename to jupyter_server/tests/services/contents/__init__.py
diff --git a/tests/services/contents/test_api.py b/jupyter_server/tests/services/contents/test_api.py
similarity index 100%
rename from tests/services/contents/test_api.py
rename to jupyter_server/tests/services/contents/test_api.py
diff --git a/tests/services/contents/test_config.py b/jupyter_server/tests/services/contents/test_config.py
similarity index 100%
rename from tests/services/contents/test_config.py
rename to jupyter_server/tests/services/contents/test_config.py
diff --git a/tests/services/contents/test_fileio.py b/jupyter_server/tests/services/contents/test_fileio.py
similarity index 100%
rename from tests/services/contents/test_fileio.py
rename to jupyter_server/tests/services/contents/test_fileio.py
diff --git a/tests/services/contents/test_largefilemanager.py b/jupyter_server/tests/services/contents/test_largefilemanager.py
similarity index 100%
rename from tests/services/contents/test_largefilemanager.py
rename to jupyter_server/tests/services/contents/test_largefilemanager.py
diff --git a/tests/services/contents/test_manager.py b/jupyter_server/tests/services/contents/test_manager.py
similarity index 100%
rename from tests/services/contents/test_manager.py
rename to jupyter_server/tests/services/contents/test_manager.py
diff --git a/tests/services/kernels/__init__.py b/jupyter_server/tests/services/kernels/__init__.py
similarity index 100%
rename from tests/services/kernels/__init__.py
rename to jupyter_server/tests/services/kernels/__init__.py
diff --git a/tests/services/kernels/test_api.py b/jupyter_server/tests/services/kernels/test_api.py
similarity index 100%
rename from tests/services/kernels/test_api.py
rename to jupyter_server/tests/services/kernels/test_api.py
diff --git a/tests/services/kernels/test_config.py b/jupyter_server/tests/services/kernels/test_config.py
similarity index 100%
rename from tests/services/kernels/test_config.py
rename to jupyter_server/tests/services/kernels/test_config.py
diff --git a/tests/services/kernels/test_cull.py b/jupyter_server/tests/services/kernels/test_cull.py
similarity index 100%
rename from tests/services/kernels/test_cull.py
rename to jupyter_server/tests/services/kernels/test_cull.py
diff --git a/tests/services/kernelspecs/__init__.py b/jupyter_server/tests/services/kernelspecs/__init__.py
similarity index 100%
rename from tests/services/kernelspecs/__init__.py
rename to jupyter_server/tests/services/kernelspecs/__init__.py
diff --git a/tests/services/kernelspecs/test_api.py b/jupyter_server/tests/services/kernelspecs/test_api.py
similarity index 100%
rename from tests/services/kernelspecs/test_api.py
rename to jupyter_server/tests/services/kernelspecs/test_api.py
diff --git a/tests/services/nbconvert/__init__.py b/jupyter_server/tests/services/nbconvert/__init__.py
similarity index 100%
rename from tests/services/nbconvert/__init__.py
rename to jupyter_server/tests/services/nbconvert/__init__.py
diff --git a/tests/services/nbconvert/test_api.py b/jupyter_server/tests/services/nbconvert/test_api.py
similarity index 100%
rename from tests/services/nbconvert/test_api.py
rename to jupyter_server/tests/services/nbconvert/test_api.py
diff --git a/tests/services/sessions/__init__.py b/jupyter_server/tests/services/sessions/__init__.py
similarity index 100%
rename from tests/services/sessions/__init__.py
rename to jupyter_server/tests/services/sessions/__init__.py
diff --git a/tests/services/sessions/test_api.py b/jupyter_server/tests/services/sessions/test_api.py
similarity index 100%
rename from tests/services/sessions/test_api.py
rename to jupyter_server/tests/services/sessions/test_api.py
diff --git a/tests/services/sessions/test_manager.py b/jupyter_server/tests/services/sessions/test_manager.py
similarity index 100%
rename from tests/services/sessions/test_manager.py
rename to jupyter_server/tests/services/sessions/test_manager.py
diff --git a/tests/test_config_manager.py b/jupyter_server/tests/test_config_manager.py
similarity index 100%
rename from tests/test_config_manager.py
rename to jupyter_server/tests/test_config_manager.py
diff --git a/tests/test_files.py b/jupyter_server/tests/test_files.py
similarity index 100%
rename from tests/test_files.py
rename to jupyter_server/tests/test_files.py
diff --git a/tests/test_gateway.py b/jupyter_server/tests/test_gateway.py
similarity index 100%
rename from tests/test_gateway.py
rename to jupyter_server/tests/test_gateway.py
diff --git a/tests/test_paths.py b/jupyter_server/tests/test_paths.py
similarity index 100%
rename from tests/test_paths.py
rename to jupyter_server/tests/test_paths.py
diff --git a/tests/test_serialize.py b/jupyter_server/tests/test_serialize.py
similarity index 100%
rename from tests/test_serialize.py
rename to jupyter_server/tests/test_serialize.py
diff --git a/tests/test_serverapp.py b/jupyter_server/tests/test_serverapp.py
similarity index 100%
rename from tests/test_serverapp.py
rename to jupyter_server/tests/test_serverapp.py
diff --git a/tests/test_terminal.py b/jupyter_server/tests/test_terminal.py
similarity index 100%
rename from tests/test_terminal.py
rename to jupyter_server/tests/test_terminal.py
diff --git a/tests/test_traittypes.py b/jupyter_server/tests/test_traittypes.py
similarity index 100%
rename from tests/test_traittypes.py
rename to jupyter_server/tests/test_traittypes.py
diff --git a/tests/test_utils.py b/jupyter_server/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to jupyter_server/tests/test_utils.py
diff --git a/tests/test_version.py b/jupyter_server/tests/test_version.py
similarity index 100%
rename from tests/test_version.py
rename to jupyter_server/tests/test_version.py
diff --git a/tests/test_view.py b/jupyter_server/tests/test_view.py
similarity index 100%
rename from tests/test_view.py
rename to jupyter_server/tests/test_view.py
diff --git a/tests/utils.py b/jupyter_server/tests/utils.py
similarity index 100%
rename from tests/utils.py
rename to jupyter_server/tests/utils.py
diff --git a/pytest.ini b/pytest.ini
index 8e564d8748..a5e0d52edd 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,5 @@
 [pytest]
 # Exclude the example tests.
 norecursedirs = examples/*
+# Work around for https://github.com/pytest-dev/pytest/issues/4039
+addopts = --pyargs jupyter_server