Changeset 2e736df in mod_gnutls for test/https-test-client.py

Timestamp:

Dec 4, 2019, 9:41:20 AM (17 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

1de6754

Parents:

ce85a5f

Message:

https-test-client.py: Require --test-config parameter

This allows a lot of simplifications in the code, in particular it
limits the amount of parameters that influence the gnutls-cli command
to host and port.

File:

• test/https-test-client.py (modified) (3 diffs)

test/https-test-client.py

@@ -336 +336 @@
     parser.add_argument('host', nargs='?', help='Access the specified host',
                         default='localhost')
-    parser.add_argument('--insecure', action='store_true',
-                        help='do not validate the server certificate')
     parser.add_argument('-p', '--port', type=int,
                         help='Access the specified port', default='8000')
-    parser.add_argument('--x509cafile', type=str,
-                        help='Use the specified CA to validate the '
-                        'server certificate')
     parser.add_argument('--test-config', type=argparse.FileType('r'),
-                        help='load YAML test configuration')
+                        required=True, help='load YAML test configuration')
 
     # enable bash completion if argcomplete is available
@@ -356 +351 @@
 
     test_conn = None
-    test_actions = None
-
-    if args.test_config:
-        config = yaml.load(args.test_config, Loader=yaml.Loader)
-        if type(config) is TestConnection:
-            test_conn = config
-            print(test_conn)
-            test_actions = test_conn.actions
+
+    config = yaml.load(args.test_config, Loader=yaml.Loader)
+    if type(config) is TestConnection:
+        test_conn = config
+        print(test_conn)
     else:
-        # simple default request
-        test_actions = [TestRequest(path='/test.txt',
-                                    expect={'status': 200, 'body': 'test\n'},
-                                    method='GET')]
-
+        raise TypeError(f'Unsupported configuration: {config!r}')
 
     # note: "--logfile" option requires GnuTLS version >= 3.6.7
     command = ['gnutls-cli', '--logfile=/dev/stderr']
-    if args.insecure:
-        command.append('--insecure')
-    if args.x509cafile:
-        command.append('--x509cafile')
-        command.append(args.x509cafile)
-    if test_conn != None:
-        for s in test_conn.gnutls_params:
-            command.append('--' + s)
+    for s in test_conn.gnutls_params:
+        command.append('--' + s)
     command = command + ['-p', str(args.port), args.host]
 
@@ -388 +370 @@
 
     try:
-        for act in test_actions:
+        for act in test_conn.actions:
             if type(act) is TestRequest:
                 act.run(conn)