Changeset 21cd807 in mod_gnutls

Timestamp:

Aug 27, 2020, 5:44:23 PM (6 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio

Children:

d17866f

Parents:

0c963e8

Message:

Use .yaml ending for all YAML files

Files:

• .github/workflows/build.yaml (moved) (moved from .github/workflows/build.yml)
• .github/workflows/valgrind.yaml (moved) (moved from .github/workflows/valgrind.yml)
• test/Makefile.am (modified) (1 diff)
• test/README.md (modified) (1 diff)
• test/runtest.py (modified) (1 diff)
• test/sample_fail.yaml (moved) (moved from test/sample_fail.yml)
• test/sample_test.yaml (moved) (moved from test/sample_test.yml)
• test/tests/00_basic/test.yaml (moved) (moved from test/tests/00_basic/test.yml)
• test/tests/01_priorities_config/test.yaml (moved) (moved from test/tests/01_priorities_config/test.yml)
• test/tests/02_cache_in_vhost/test.yaml (moved) (moved from test/tests/02_cache_in_vhost/test.yml)
• test/tests/03_cachetimeout_in_vhost/test.yaml (moved) (moved from test/tests/03_cachetimeout_in_vhost/test.yml)
• test/tests/04_basic_nosni/test.yaml (moved) (moved from test/tests/04_basic_nosni/test.yml)
• test/tests/06_verify_sni_a/test.yaml (moved) (moved from test/tests/06_verify_sni_a/test.yml)
• test/tests/07_verify_sni_b/test.yaml (moved) (moved from test/tests/07_verify_sni_b/test.yml)
• test/tests/08_verify_no_sni_fallback_to_first_vhost/test.yaml (moved) (moved from test/tests/08_verify_no_sni_fallback_to_first_vhost/test.yml)
• test/tests/09_verify_no_sni_fails_with_wrong_order/test.yaml (moved) (moved from test/tests/09_verify_no_sni_fails_with_wrong_order/test.yml)
• test/tests/10_basic_client_verification/test.yaml (moved) (moved from test/tests/10_basic_client_verification/test.yml)
• test/tests/11_basic_client_verification_fail/test.yaml (moved) (moved from test/tests/11_basic_client_verification_fail/test.yml)
• test/tests/12_cgi_variables/test.yaml (moved) (moved from test/tests/12_cgi_variables/test.yml)
• test/tests/13_cgi_variables_no_client_cert/test.yaml (moved) (moved from test/tests/13_cgi_variables_no_client_cert/test.yml)
• test/tests/14_resume_session/test.yaml (moved) (moved from test/tests/14_resume_session/test.yml)
• test/tests/15_basic_msva/test.yaml (moved) (moved from test/tests/15_basic_msva/test.yml)
• test/tests/16_view-status/test.yaml (moved) (moved from test/tests/16_view-status/test.yml)
• test/tests/17_cgi_vars_large_cert/test.yaml (moved) (moved from test/tests/17_cgi_vars_large_cert/test.yml)
• test/tests/18_client_verification_wrong_cert/test.yaml (moved) (moved from test/tests/18_client_verification_wrong_cert/test.yml)
• test/tests/19_TLS_reverse_proxy/test.yaml (moved) (moved from test/tests/19_TLS_reverse_proxy/test.yml)
• test/tests/20_TLS_reverse_proxy_client_auth/test.yaml (moved) (moved from test/tests/20_TLS_reverse_proxy_client_auth/test.yml)
• test/tests/21_TLS_reverse_proxy_wrong_cert/test.yaml (moved) (moved from test/tests/21_TLS_reverse_proxy_wrong_cert/test.yml)
• test/tests/22_TLS_reverse_proxy_crl_revoke/test.yaml (moved) (moved from test/tests/22_TLS_reverse_proxy_crl_revoke/test.yml)
• test/tests/23_TLS_reverse_proxy_mismatched_priorities/test.yaml (moved) (moved from test/tests/23_TLS_reverse_proxy_mismatched_priorities/test.yml)
• test/tests/24_pkcs11_cert/test.yaml (moved) (moved from test/tests/24_pkcs11_cert/test.yml)
• test/tests/25_Disable_TLS_1.0/test.yaml (moved) (moved from test/tests/25_Disable_TLS_1.0/test.yml)
• test/tests/26_redirect_HTTP_to_HTTPS/test.yaml (moved) (moved from test/tests/26_redirect_HTTP_to_HTTPS/test.yml)
• test/tests/27_OCSP_server/test.yaml (moved) (moved from test/tests/27_OCSP_server/test.yml)
• test/tests/29_force_handshake_vhost/test.yaml (moved) (moved from test/tests/29_force_handshake_vhost/test.yml)
• test/tests/30_ip_based_vhosts/test.yaml (moved) (moved from test/tests/30_ip_based_vhosts/test.yml)
• test/tests/31_vhost_SNI_serveralias_match/test.yaml (moved) (moved from test/tests/31_vhost_SNI_serveralias_match/test.yml)
• test/tests/32_vhost_SNI_serveralias_mismatch/test.yaml (moved) (moved from test/tests/32_vhost_SNI_serveralias_mismatch/test.yml)
• test/tests/33_vhost_SNI_serveralias_missinghost/test.yaml (moved) (moved from test/tests/33_vhost_SNI_serveralias_missinghost/test.yml)
• test/tests/34_TLS_reverse_proxy_h2/test.yaml (moved) (moved from test/tests/34_TLS_reverse_proxy_h2/test.yml)
• test/tests/35_client_reauth/test.yaml (moved) (moved from test/tests/35_client_reauth/test.yml)
• test/tests/36_OCSP_server_nonce/test.yaml (moved) (moved from test/tests/36_OCSP_server_nonce/test.yml)
• test/tests/37_TLS_reverse_proxy_resume_session/test.yaml (moved) (moved from test/tests/37_TLS_reverse_proxy_resume_session/test.yml)
• test/tests/Makefile.am (modified) (1 diff)

test/Makefile.am

@@ -285 +285 @@
 
 # Documentation for the test system
-test_doc = README.md sample_fail.yml sample_test.yml
+test_doc = README.md sample_fail.yaml sample_test.yaml
 
 EXTRA_DIST += $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \

test/README.md

@@ -67 +67 @@
 * `apache.conf` -- Apache configuration to be used
 
-* `test.yml` -- Defines the client connection(s) including parameters
+* `test.yaml` -- Defines the client connection(s) including parameters
   for `gnutls-cli`, the request(s), and expected response(s). Please
   see the module documentation of [mgstest.tests](./mgstest/tests.py)
-  for details, and [`sample_test.yml`](./sample_test.yml) and
-  [`sample_fail.yml`](./sample_fail.yml) for examples.
+  for details, and [`sample_test.yaml`](./sample_test.yaml) and
+  [`sample_fail.yaml`](./sample_fail.yaml) for examples.
 
 * `backend.conf` [optional] -- Apache configuration for the proxy

test/runtest.py

@@ -103 +103 @@
     # Load test config
     try:
-        with open(os.path.join(testdir, 'test.yml'), 'r') as conf_file:
+        with open(os.path.join(testdir, 'test.yaml'), 'r') as conf_file:
             test_conf = yaml.load(conf_file, Loader=yaml.Loader)
     except FileNotFoundError:

test/tests/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST = \
-        00_basic/apache.conf 00_basic/test.yml \
-        01_priorities_config/apache.conf 01_priorities_config/test.yml \
-        02_cache_in_vhost/apache.conf 02_cache_in_vhost/fail.server 02_cache_in_vhost/test.yml \
-        03_cachetimeout_in_vhost/apache.conf 03_cachetimeout_in_vhost/test.yml \
-        04_basic_nosni/apache.conf 04_basic_nosni/test.yml \
-        06_verify_sni_a/apache.conf 06_verify_sni_a/test.yml \
-        07_verify_sni_b/apache.conf 07_verify_sni_b/test.yml \
-        08_verify_no_sni_fallback_to_first_vhost/apache.conf 08_verify_no_sni_fallback_to_first_vhost/test.yml \
-        09_verify_no_sni_fails_with_wrong_order/apache.conf 09_verify_no_sni_fails_with_wrong_order/test.yml \
-        10_basic_client_verification/apache.conf 10_basic_client_verification/test.yml \
-        11_basic_client_verification_fail/apache.conf 11_basic_client_verification_fail/test.yml \
-        12_cgi_variables/apache.conf 12_cgi_variables/test.yml \
-        13_cgi_variables_no_client_cert/apache.conf 13_cgi_variables_no_client_cert/test.yml \
-        14_resume_session/apache.conf 14_resume_session/hooks.py 14_resume_session/test.yml \
-        15_basic_msva/apache.conf 15_basic_msva/hooks.py 15_basic_msva/test.yml \
-        16_view-status/apache.conf 16_view-status/test.yml \
-        17_cgi_vars_large_cert/apache.conf 17_cgi_vars_large_cert/test.yml \
-        18_client_verification_wrong_cert/apache.conf 18_client_verification_wrong_cert/test.yml \
-        19_TLS_reverse_proxy/apache.conf 19_TLS_reverse_proxy/backend.conf 19_TLS_reverse_proxy/test.yml \
-        20_TLS_reverse_proxy_client_auth/apache.conf 20_TLS_reverse_proxy_client_auth/backend.conf 20_TLS_reverse_proxy_client_auth/test.yml \
-        21_TLS_reverse_proxy_wrong_cert/apache.conf 21_TLS_reverse_proxy_wrong_cert/backend.conf 21_TLS_reverse_proxy_wrong_cert/test.yml \
-        22_TLS_reverse_proxy_crl_revoke/apache.conf 22_TLS_reverse_proxy_crl_revoke/backend.conf 22_TLS_reverse_proxy_crl_revoke/test.yml \
-        23_TLS_reverse_proxy_mismatched_priorities/apache.conf 23_TLS_reverse_proxy_mismatched_priorities/backend.conf 23_TLS_reverse_proxy_mismatched_priorities/test.yml \
-        24_pkcs11_cert/apache.conf 24_pkcs11_cert/hooks.py 24_pkcs11_cert/test.yml \
-        25_Disable_TLS_1.0/apache.conf 25_Disable_TLS_1.0/test.yml \
-        26_redirect_HTTP_to_HTTPS/apache.conf 26_redirect_HTTP_to_HTTPS/test.yml \
-        27_OCSP_server/apache.conf 27_OCSP_server/hooks.py 27_OCSP_server/ocsp.conf 27_OCSP_server/test.yml \
+        00_basic/apache.conf 00_basic/test.yaml \
+        01_priorities_config/apache.conf 01_priorities_config/test.yaml \
+        02_cache_in_vhost/apache.conf 02_cache_in_vhost/fail.server 02_cache_in_vhost/test.yaml \
+        03_cachetimeout_in_vhost/apache.conf 03_cachetimeout_in_vhost/test.yaml \
+        04_basic_nosni/apache.conf 04_basic_nosni/test.yaml \
+        06_verify_sni_a/apache.conf 06_verify_sni_a/test.yaml \
+        07_verify_sni_b/apache.conf 07_verify_sni_b/test.yaml \
+        08_verify_no_sni_fallback_to_first_vhost/apache.conf 08_verify_no_sni_fallback_to_first_vhost/test.yaml \
+        09_verify_no_sni_fails_with_wrong_order/apache.conf 09_verify_no_sni_fails_with_wrong_order/test.yaml \
+        10_basic_client_verification/apache.conf 10_basic_client_verification/test.yaml \
+        11_basic_client_verification_fail/apache.conf 11_basic_client_verification_fail/test.yaml \
+        12_cgi_variables/apache.conf 12_cgi_variables/test.yaml \
+        13_cgi_variables_no_client_cert/apache.conf 13_cgi_variables_no_client_cert/test.yaml \
+        14_resume_session/apache.conf 14_resume_session/hooks.py 14_resume_session/test.yaml \
+        15_basic_msva/apache.conf 15_basic_msva/hooks.py 15_basic_msva/test.yaml \
+        16_view-status/apache.conf 16_view-status/test.yaml \
+        17_cgi_vars_large_cert/apache.conf 17_cgi_vars_large_cert/test.yaml \
+        18_client_verification_wrong_cert/apache.conf 18_client_verification_wrong_cert/test.yaml \
+        19_TLS_reverse_proxy/apache.conf 19_TLS_reverse_proxy/backend.conf 19_TLS_reverse_proxy/test.yaml \
+        20_TLS_reverse_proxy_client_auth/apache.conf 20_TLS_reverse_proxy_client_auth/backend.conf 20_TLS_reverse_proxy_client_auth/test.yaml \
+        21_TLS_reverse_proxy_wrong_cert/apache.conf 21_TLS_reverse_proxy_wrong_cert/backend.conf 21_TLS_reverse_proxy_wrong_cert/test.yaml \
+        22_TLS_reverse_proxy_crl_revoke/apache.conf 22_TLS_reverse_proxy_crl_revoke/backend.conf 22_TLS_reverse_proxy_crl_revoke/test.yaml \
+        23_TLS_reverse_proxy_mismatched_priorities/apache.conf 23_TLS_reverse_proxy_mismatched_priorities/backend.conf 23_TLS_reverse_proxy_mismatched_priorities/test.yaml \
+        24_pkcs11_cert/apache.conf 24_pkcs11_cert/hooks.py 24_pkcs11_cert/test.yaml \
+        25_Disable_TLS_1.0/apache.conf 25_Disable_TLS_1.0/test.yaml \
+        26_redirect_HTTP_to_HTTPS/apache.conf 26_redirect_HTTP_to_HTTPS/test.yaml \
+        27_OCSP_server/apache.conf 27_OCSP_server/hooks.py 27_OCSP_server/ocsp.conf 27_OCSP_server/test.yaml \
         28_HTTP2_support/apache.conf 28_HTTP2_support/hooks.py \
-        29_force_handshake_vhost/apache.conf 29_force_handshake_vhost/test.yml \
-        30_ip_based_vhosts/apache.conf 30_ip_based_vhosts/hooks.py 30_ip_based_vhosts/test.yml \
-        31_vhost_SNI_serveralias_match/apache.conf 31_vhost_SNI_serveralias_match/test.yml \
-        32_vhost_SNI_serveralias_mismatch/apache.conf 32_vhost_SNI_serveralias_mismatch/test.yml \
-        33_vhost_SNI_serveralias_missinghost/apache.conf 33_vhost_SNI_serveralias_missinghost/test.yml \
-        34_TLS_reverse_proxy_h2/apache.conf 34_TLS_reverse_proxy_h2/hooks.py 34_TLS_reverse_proxy_h2/backend.conf 34_TLS_reverse_proxy_h2/test.yml \
-        35_client_reauth/apache.conf 35_client_reauth/test.yml \
-        36_OCSP_server_nonce/apache.conf 36_OCSP_server_nonce/hooks.py 36_OCSP_server_nonce/ocsp.conf 36_OCSP_server_nonce/test.yml \
-        37_TLS_reverse_proxy_resume_session/apache.conf 37_TLS_reverse_proxy_resume_session/backend.conf 37_TLS_reverse_proxy_resume_session/hooks.py 37_TLS_reverse_proxy_resume_session/test.yml
+        29_force_handshake_vhost/apache.conf 29_force_handshake_vhost/test.yaml \
+        30_ip_based_vhosts/apache.conf 30_ip_based_vhosts/hooks.py 30_ip_based_vhosts/test.yaml \
+        31_vhost_SNI_serveralias_match/apache.conf 31_vhost_SNI_serveralias_match/test.yaml \
+        32_vhost_SNI_serveralias_mismatch/apache.conf 32_vhost_SNI_serveralias_mismatch/test.yaml \
+        33_vhost_SNI_serveralias_missinghost/apache.conf 33_vhost_SNI_serveralias_missinghost/test.yaml \
+        34_TLS_reverse_proxy_h2/apache.conf 34_TLS_reverse_proxy_h2/hooks.py 34_TLS_reverse_proxy_h2/backend.conf 34_TLS_reverse_proxy_h2/test.yaml \
+        35_client_reauth/apache.conf 35_client_reauth/test.yaml \
+        36_OCSP_server_nonce/apache.conf 36_OCSP_server_nonce/hooks.py 36_OCSP_server_nonce/ocsp.conf 36_OCSP_server_nonce/test.yaml \
+        37_TLS_reverse_proxy_resume_session/apache.conf 37_TLS_reverse_proxy_resume_session/backend.conf 37_TLS_reverse_proxy_resume_session/hooks.py 37_TLS_reverse_proxy_resume_session/test.yaml