Changeset 1fe7cac in mod_gnutls for test

Timestamp:

Jan 5, 2020, 5:43:41 AM (16 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

459a982

Parents:

0b3733d

git-author:

Fiona Klute <fiona.klute@…> (01/05/20 05:41:39)

git-committer:

Fiona Klute <fiona.klute@…> (01/05/20 05:43:41)

Message:

TestReq10: Handle expected and unexpected connection failure

With this TestReq10 supports the same options as TestRequest?.

Location:

test

Files:

• mgstest/tests.py (modified) (2 diffs)
• sample_fail.yml (modified) (2 diffs)
• sample_test.yml (modified) (1 diff)

test/mgstest/tests.py

@@ -43 +43 @@
 # HTTPS).
 transport: 'gnutls'
-description='This connection description will be logged.'
+description: 'This connection description will be logged.'
 actions:
   - !request
@@ -364 +364 @@
             print(errs.decode(), file=conn_log)
 
+        if proc.returncode != 0:
+            if len(outs) != 0:
+                raise TestExpectationFailed(
+                    f'Connection failed, but got output: {outs!r}')
+            if self.expects_conn_reset():
+                print('connection reset as expected.')
+                return
+            else:
+                raise TestExpectationFailed(
+                    'Connection failed unexpectedly!')
+        else:
+            if self.expects_conn_reset():
+                raise TestExpectationFailed(
+                    'Expected connection reset did not occur!')
+
         # first line of the received data must be the status
         status, rest = outs.decode().split('\r\n', maxsplit=1)

test/sample_fail.yml

@@ -1 @@
-# Example: The first TLS connection fails (certificate error), the
-# second succeeds but receives a 404.
 - !connection
+  description: 'This TLS connection must fail with a certificate error.'
   gnutls_params:
     - x509cafile=rogueca/x509.pem
@@ -10 +9 @@
         reset: yes
 - !connection
+  description: 'TLS connection succeeds, the request receives error 404.'
   gnutls_params:
     - x509cafile=authority/x509.pem
   actions:
     - !request
-      path: /
+      path: /missing-file.txt
       expect:
         status: 404
+- !connection
+  description: 'This TLS connection must fail with a certificate error.'
+  gnutls_params:
+    - x509cafile=rogueca/x509.pem
+  actions:
+    - !request10
+      path: /test.txt
+      headers:
+        Host: localhost
+      expect:
+        reset: yes

test/sample_test.yml

@@ -28 +28 @@
           - 'Using GnuTLS version: '
           - 'Current TLS session: (TLS1.3)'
+  - !request10
+    path: /test.txt
+    headers:
+      Host: localhost
+    expect:
+      headers:
+        Content-Type: 'text/plain'