Fix up testing after switch to pytest

pytest exposes many warnings, some but not all of which are cleaned
up here. The main switch is to use html.escape instead of cgi.escape.
This inspired the addition of 'future' to requirements.

The remaining warnings are related to pytest deprecations or over-eager
test discovery.

It is perhaps ironic that the switch to pytest is to avoid nose being
mostly dead, and now we are using features in pytest that pytest wants
to make dead. These are left for later cleanups, which means that
running the tests is noisy.

2 files changed, 1 insertions, 1 deletions

diff --git a/tests/test_template.txt b/tests/template.txt
index 1313d34..1313d34 100644
--- a/tests/test_template.txt
+++ b/tests/template.txt
diff --git a/tests/test_doctests.py b/tests/test_doctests.py
index d59d666..efea589 100644
--- a/tests/test_doctests.py
+++ b/tests/test_doctests.py
@@ -4,7 +4,7 @@ from paste.util.import_string import simple_import
 import os
 
 filenames = [
-    'tests/test_template.txt',
+    'tests/template.txt',
     ]
 
 modules = [