Merge pull request #6062 from davidlowryduda/testing

Remove unittest2, return to unittest

lmfdb/artin_representations/test_artin_representation.py

@@ -1,5 +1,4 @@
 from lmfdb.tests import LmfdbTest
-#import unittest2
 
 class ArtinRepTest(LmfdbTest):
 

lmfdb/classical_modular_forms/test_cmf.py

@@ -1,6 +1,6 @@
 
 from lmfdb.tests import LmfdbTest
-import unittest2
+import unittest
 
 from . import cmf_logger
 cmf_logger.setLevel(100)
@@ -76,7 +76,7 @@ def test_level_bread(self):
         assert '10.10.b.a' in page.get_data(as_text=True)
         assert '2580' in page.get_data(as_text=True)
 
-    @unittest2.skip("Long tests for many newform spaces, should be run & pass before any release")
+    @unittest.skip("Long tests for many newform spaces, should be run & pass before any release")
     def test_many(self):
         from sage.all import ZZ
         for Nk2 in range(1, 2001):

lmfdb/tests/__init__.py

@@ -1,4 +1,5 @@
-import unittest2
+import unittest
+
 from urllib.request import Request, urlopen
 from urllib.error import URLError
 import ssl
@@ -16,7 +17,7 @@
 assert NumberField
 
 
-class LmfdbTest(unittest2.TestCase):
+class LmfdbTest(unittest.TestCase):
     def setUp(self):
         app.config["TESTING"] = True
         self.app = app

lmfdb/tests/test_root.py

@@ -1,4 +1,5 @@
-import unittest2
+import unittest
+
 from flask import url_for
 from lmfdb.tests import LmfdbTest
 
@@ -37,7 +38,7 @@ def test_css(self):
         assert '*[knowl]' in css
         assert 'border-bottom: 1px dotted' in css
 
-    @unittest2.skip("Tests all url_maps, but fails at the moment because of other errors")
+    @unittest.skip("Tests all url_maps, but fails at the moment because of other errors")
     def test_url_map(self):
         """
 
@@ -48,7 +49,7 @@ def test_url_map(self):
                 res = tc.get(rule.rule)
                 assert "Database" in res.get_data(as_text=True), "rule %s failed " % rule
 
-    @unittest2.skip("Tests for latex errors, but fails at the moment because of other errors")
+    @unittest.skip("Tests for latex errors, but fails at the moment because of other errors")
     def test_some_latex_error(self):
         """
           Tests for latex errors, but fails at the moment because of other errors

lmfdb/tests/test_spelling.py

@@ -1,13 +1,13 @@
 
 
 from lmfdb.tests import LmfdbTest
-import unittest2
+import unittest
 
 
 class SpellingTest(LmfdbTest):
     # this tests the spelling on the website
 
-    @unittest2.skip("Tests for 'zeroes' should be 'zeros', but fails at the moment because of other errors")
+    @unittest.skip("Tests for 'zeroes' should be 'zeros', but fails at the moment because of other errors")
     def test_zeroes_spelling(self):
         """
             'zeroes' should be 'zeros'

lmfdb/tests/test_tensor_products.py

@@ -1,4 +1,5 @@
-import unittest2
+import unittest
+
 from lmfdb.tests import LmfdbTest
 
 
@@ -11,12 +12,12 @@ class TensorProductTest(LmfdbTest):
     conductor is displayed somewhere on the page.
     """
 
-    @unittest2.skip("Tests tensor product of elliptic curve and Dirchlet L-functions -- skipping all tensor product tests ")
+    @unittest.skip("Tests tensor product of elliptic curve and Dirchlet L-functions -- skipping all tensor product tests ")
     def test_ellcurve_dirichletchar(self):
         L = self.tc.get("/TensorProducts/show/?obj1=Character%2FDirichlet%2F13%2F2&obj2=EllipticCurve%2FQ%2F11.a2")
         assert '1859' in L.get_data(as_text=True)
 
-    @unittest2.skip("Tests tensor product of artin rep and modular form L-functions -- skipping all tensor product tests ")
+    @unittest.skip("Tests tensor product of artin rep and modular form L-functions -- skipping all tensor product tests ")
     def test_modform_artinrep(self):
         L1 = self.tc.get("ModularForm/GL2/Q/holomorphic/1/12/1/a/")
         assert "6048q^{6}" in L1.get_data(as_text=True)

lmfdb/tests/test_utils.py

@@ -6,7 +6,7 @@
 # License as published by the Free Software Foundation; either
 # version 2 of the License, or (at your option) any later version.
 
-import unittest2
+import unittest
 
 from sage.all import var
 
@@ -31,7 +31,7 @@
 )
 
 
-class UtilsTest(unittest2.TestCase):
+class UtilsTest(unittest.TestCase):
     """
     An example of unit tests that are not based on the website itself.
     """

requirements.txt

@@ -14,4 +14,3 @@ pytest-cov
 pytest-xdist
 pyyaml
 timeout_decorator
-git+https://github.com/edgarcosta/unittest2

test.sh

@@ -5,12 +5,11 @@
 
 # Note: to run the tests, sage must be in your path.  If necessary do
 # export PATH=$PATH:/path/to/sage
-# To run it, first install or upgrade "pytest", "unittest2" "pytest-cov" and
-# "pyflakes".  e.g. $ pip install --user -U pytest pytest-cov unittest2 pyflakes
-# or $ sage -pip install --user -U pytest pytest-cov unittest2 pyflakes
+# To run it, first install or upgrade "pytest", "pytest-cov" and
+# "pyflakes".  e.g. $ pip install --user -U pytest pytest-cov pyflakes
+# or $ sage -pip install --user -U pytest pytest-cov pyflakes
 # or inside the Sage environment: $ easy_install -U pytest
 #                                 $ easy_install -U pytest-cov
-#                                 $ easy_install -U unittest2
 #                                 $ easy_install -U pyflakes
 # Second, call it in three ways, either
 # $ ./test.sh to test all