Changeset c6d4701 in mod_gnutls

Timestamp:

Mar 10, 2021, 3:25:32 AM (6 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

520ab08

Parents:

3d7865f

Message:

mgstest.tests.TestRequest?: Move tests to unittest

The tests previously done via doctest didn't really document
anything. Running them via unittest is more flexible and might allow
for future extensions.

Location:

test

Files:

• Makefile.am (modified) (2 diffs)
• mgstest/test_tests.py (added)
• mgstest/tests.py (modified) (3 diffs)
• unittest-mgstest.py (added)

test/Makefile.am

@@ -50 +50 @@
 TEST_EXTENSIONS = .bash .py
 PY_LOG_COMPILER = $(PYTHON)
-TESTS = doctest-mgstest.py $(test_scripts)
+TESTS = doctest-mgstest.py unittest-mgstest.py $(test_scripts)
 
 check_PROGRAMS = pgpcrc
@@ -67 +67 @@
 noinst_PYTHON = https-test-client.py mgstest/http.py mgstest/__init__.py \
         mgstest/hooks.py mgstest/ocsp.py mgstest/services.py \
-        mgstest/softhsm.py mgstest/tests.py mgstest/valgrind.py runtest.py \
-        softhsm-init.py doctest-mgstest.py required-modules.py data/ocsp.py \
-        check_test_ips.py
+        mgstest/softhsm.py mgstest/tests.py mgstest/valgrind.py \
+        mgstest/test_tests.py runtest.py \
+        softhsm-init.py doctest-mgstest.py unittest-mgstest.py \
+        required-modules.py data/ocsp.py check_test_ips.py
 
 # Identities in the miniature CA, server, and client environment for

test/mgstest/tests.py

@@ -251 +251 @@
 
     def check_headers(self, headers):
-        """
-        >>> r1 = TestRequest(path='/test.txt',
-        ...                  expect={'headers': {'X-Forbidden-Header': None,
-        ...                                      'X-Required-Header': 'Hi!'}})
-        >>> r1.check_headers({'X-Required-Header': 'Hi!'})
-        >>> r1.check_headers({'X-Required-Header': 'Hello!'})
-        Traceback (most recent call last):
-        ...
-        mgstest.TestExpectationFailed: Unexpected value in header \
-X-Required-Header: 'Hello!', expected 'Hi!'
-        >>> r1.check_headers({'X-Forbidden-Header': 'Hi!'})
-        Traceback (most recent call last):
-        ...
-        mgstest.TestExpectationFailed: Unexpected value in header \
-X-Forbidden-Header: 'Hi!', expected None
-        """
         for name, expected in self.expect['headers'].items():
             value = headers.get(name)
@@ -276 +260 @@
 
     def check_body(self, body):
-        """
-        >>> r1 = TestRequest(path='/test.txt', method='GET', headers={}, \
-expect={'status': 200, 'body': {'exactly': 'test\\n'}})
-        >>> r1.check_body('test\\n')
-        >>> r1.check_body('xyz\\n')
-        Traceback (most recent call last):
-        ...
-        mgstest.TestExpectationFailed: Unexpected body: 'xyz\\n' != 'test\\n'
-        >>> r2 = TestRequest(path='/test.txt', method='GET', headers={}, \
-expect={'status': 200, 'body': {'contains': ['tes', 'est']}})
-        >>> r2.check_body('test\\n')
-        >>> r2.check_body('est\\n')
-        Traceback (most recent call last):
-        ...
-        mgstest.TestExpectationFailed: Unexpected body: 'est\\n' \
-does not contain 'tes'
-        >>> r3 = TestRequest(path='/test.txt', method='GET', headers={}, \
-expect={'status': 200, 'body': {'contains': 'test'}})
-        >>> r3.check_body('test\\n')
-        """
         if 'exactly' in self.expect['body'] \
            and body != self.expect['body']['exactly']:
@@ -328 +292 @@
         connection being reset. That usually means the underlying TLS
         connection failed.
-
-        >>> r1 = TestRequest(path='/test.txt', method='GET', headers={}, \
-expect={'status': 200, 'body': {'contains': 'test'}})
-        >>> r1.expects_conn_reset()
-        False
-        >>> r2 = TestRequest(path='/test.txt', method='GET', headers={}, \
-expect={'reset': True})
-        >>> r2.expects_conn_reset()
-        True
         """
         if 'reset' in self.expect: