From da0fef56eb4f765f0746de2a44a0c4807895921d Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Sun, 15 Nov 2020 13:23:11 -0500
Subject: [PATCH] updates from review

---
 jupyter_server/serverapp.py | 17 ++++++++---------
 tests/conftest.py           |  0
 tests/test_files.py         |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 tests/conftest.py

diff --git a/jupyter_server/serverapp.py b/jupyter_server/serverapp.py
index 1a32841cf4..091ef4b7a8 100755
--- a/jupyter_server/serverapp.py
+++ b/jupyter_server/serverapp.py
@@ -41,17 +41,16 @@
 from jupyter_server.transutils import trans, _
 from jupyter_server.utils import secure_write, run_sync
 
-# check for tornado 3.1.0
+# the minimum viable tornado version: needs to be kept in sync with setup.py
+MIN_TORNADO = (6, 1)
+
 try:
     import tornado
-except ImportError as e:
-    raise ImportError(_("The Jupyter Server requires tornado >= 4.0")) from e
-try:
-    version_info = tornado.version_info
-except AttributeError as e:
-    raise ImportError(_("The Jupyter Server requires tornado >= 4.0, but you have < 1.1.0")) from e
-if version_info < (4,0):
-    raise ImportError(_("The Jupyter Server requires tornado >= 4.0, but you have %s") % tornado.version)
+    assert tornado.version_info >= MIN_TORNADO
+except (ImportError, AttributeError, AssertionError) as e:  # pragma: no cover
+    raise ImportError(
+        _("The Jupyter Server requires tornado >=%s", ".".join(MIN_TORNADO))
+    ) from e
 
 from tornado import httpserver
 from tornado import ioloop
diff --git a/tests/conftest.py b/tests/conftest.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/test_files.py b/tests/test_files.py
index 738b5879df..a1c3872354 100644
--- a/tests/test_files.py
+++ b/tests/test_files.py
@@ -28,7 +28,7 @@ async def fetch_expect_200(jp_fetch, *path_parts):
 
 async def fetch_expect_404(jp_fetch, *path_parts):
     with pytest.raises(tornado.httpclient.HTTPClientError) as e:
-        r = await jp_fetch('files', *path_parts, method='GET')
+        await jp_fetch('files', *path_parts, method='GET')
     assert expected_http_error(e, 404), [path_parts, e]