[glib-networking] Add the name of the backend to the test name



commit 08e7b545f85bed8a90659b2c9ceab511f12bc45e
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Fri May 17 16:22:36 2019 +0200

    Add the name of the backend to the test name

 tls/tests/certificate.c     | 34 +++++++++++------------
 tls/tests/connection.c      | 68 ++++++++++++++++++++++-----------------------
 tls/tests/dtls-connection.c | 22 +++++++--------
 tls/tests/file-database.c   | 24 ++++++++--------
 4 files changed, 74 insertions(+), 74 deletions(-)
---
diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
index 3310269..81e2ebb 100644
--- a/tls/tests/certificate.c
+++ b/tls/tests/certificate.c
@@ -562,38 +562,38 @@ main (int   argc,
   g_setenv ("GIO_USE_TLS", BACKEND, TRUE);
   g_assert (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 
0);
 
-  g_test_add ("/tls/certificate/create-pem", TestCertificate, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/create-pem", TestCertificate, NULL,
               setup_certificate, test_create_pem, teardown_certificate);
-  g_test_add ("/tls/certificate/create-der", TestCertificate, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/create-der", TestCertificate, NULL,
               setup_certificate, test_create_der, teardown_certificate);
-  g_test_add ("/tls/certificate/create-with-key-pem", TestCertificate, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/create-with-key-pem", TestCertificate, NULL,
               setup_certificate, test_create_with_key_pem, teardown_certificate);
-  g_test_add ("/tls/certificate/create-with-key-der", TestCertificate, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/create-with-key-der", TestCertificate, NULL,
               setup_certificate, test_create_with_key_der, teardown_certificate);
-  g_test_add ("/tls/certificate/create-with-issuer", TestCertificate, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/create-with-issuer", TestCertificate, NULL,
               setup_certificate, test_create_certificate_with_issuer, teardown_certificate);
-  g_test_add ("/tls/certificate/create-with-garbage-input", TestCertificate, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/create-with-garbage-input", TestCertificate, NULL,
               setup_certificate, test_create_certificate_with_garbage_input, teardown_certificate);
 
-  g_test_add_func ("/tls/certificate/create-chain", test_create_certificate_chain);
-  g_test_add_func ("/tls/certificate/create-no-chain", test_create_certificate_no_chain);
-  g_test_add_func ("/tls/certificate/create-list", test_create_list);
-  g_test_add_func ("/tls/certificate/create-list-bad", test_create_list_bad);
+  g_test_add_func ("/tls/" BACKEND "/certificate/create-chain", test_create_certificate_chain);
+  g_test_add_func ("/tls/" BACKEND "/certificate/create-no-chain", test_create_certificate_no_chain);
+  g_test_add_func ("/tls/" BACKEND "/certificate/create-list", test_create_list);
+  g_test_add_func ("/tls/" BACKEND "/certificate/create-list-bad", test_create_list_bad);
 
-  g_test_add ("/tls/certificate/verify-good", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/verify-good", TestVerify, NULL,
               setup_verify, test_verify_certificate_good, teardown_verify);
-  g_test_add ("/tls/certificate/verify-bad-identity", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/verify-bad-identity", TestVerify, NULL,
               setup_verify, test_verify_certificate_bad_identity, teardown_verify);
-  g_test_add ("/tls/certificate/verify-bad-ca", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/verify-bad-ca", TestVerify, NULL,
               setup_verify, test_verify_certificate_bad_ca, teardown_verify);
-  g_test_add ("/tls/certificate/verify-bad-before", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/verify-bad-before", TestVerify, NULL,
               setup_verify, test_verify_certificate_bad_before, teardown_verify);
-  g_test_add ("/tls/certificate/verify-bad-expired", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/verify-bad-expired", TestVerify, NULL,
               setup_verify, test_verify_certificate_bad_expired, teardown_verify);
-  g_test_add ("/tls/certificate/verify-bad-combo", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/certificate/verify-bad-combo", TestVerify, NULL,
               setup_verify, test_verify_certificate_bad_combo, teardown_verify);
 
-  g_test_add_func ("/tls/certificate/is-same", test_certificate_is_same);
+  g_test_add_func ("/tls/" BACKEND "/certificate/is-same", test_certificate_is_same);
 
   return g_test_run();
 }
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 6397115..3588484 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -2221,73 +2221,73 @@ main (int   argc,
   g_setenv ("GIO_USE_TLS", BACKEND, TRUE);
   g_assert (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 
0);
 
-  g_test_add ("/tls/connection/basic", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/basic", TestConnection, NULL,
               setup_connection, test_basic_connection, teardown_connection);
-  g_test_add ("/tls/connection/verified", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/verified", TestConnection, NULL,
               setup_connection, test_verified_connection, teardown_connection);
-  g_test_add ("/tls/connection/verified-chain", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/verified-chain", TestConnection, NULL,
               setup_connection, test_verified_chain, teardown_connection);
-  g_test_add ("/tls/connection/verified-chain-with-redundant-root-cert", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/verified-chain-with-redundant-root-cert", TestConnection, NULL,
               setup_connection, test_verified_chain_with_redundant_root_cert, teardown_connection);
-  g_test_add ("/tls/connection/verified-chain-with-duplicate-server-cert", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/verified-chain-with-duplicate-server-cert", TestConnection, NULL,
               setup_connection, test_verified_chain_with_duplicate_server_cert, teardown_connection);
-  g_test_add ("/tls/connection/verified-unordered-chain", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/verified-unordered-chain", TestConnection, NULL,
               setup_connection, test_verified_unordered_chain, teardown_connection);
-  g_test_add ("/tls/connection/verified-chain-with-alternative-ca-cert", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/verified-chain-with-alternative-ca-cert", TestConnection, NULL,
               setup_connection, test_verified_chain_with_alternative_ca_cert, teardown_connection);
-  g_test_add ("/tls/connection/invalid-chain-with-alternative-ca-cert", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/invalid-chain-with-alternative-ca-cert", TestConnection, NULL,
               setup_connection, test_invalid_chain_with_alternative_ca_cert, teardown_connection);
-  g_test_add ("/tls/connection/client-auth", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/client-auth", TestConnection, NULL,
               setup_connection, test_client_auth_connection, teardown_connection);
-  g_test_add ("/tls/connection/client-auth-rehandshake", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/client-auth-rehandshake", TestConnection, NULL,
               setup_connection, test_client_auth_rehandshake, teardown_connection);
-  g_test_add ("/tls/connection/client-auth-failure", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/client-auth-failure", TestConnection, NULL,
               setup_connection, test_client_auth_failure, teardown_connection);
-  g_test_add ("/tls/connection/client-auth-fail-missing-client-private-key", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/client-auth-fail-missing-client-private-key", TestConnection, 
NULL,
               setup_connection, test_client_auth_fail_missing_client_private_key, teardown_connection);
-  g_test_add ("/tls/connection/client-auth-request-cert", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/client-auth-request-cert", TestConnection, NULL,
               setup_connection, test_client_auth_request_cert, teardown_connection);
-  g_test_add ("/tls/connection/client-auth-request-fail", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/client-auth-request-fail", TestConnection, NULL,
               setup_connection, test_client_auth_request_fail, teardown_connection);
-  g_test_add ("/tls/connection/no-database", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/no-database", TestConnection, NULL,
               setup_connection, test_connection_no_database, teardown_connection);
-  g_test_add ("/tls/connection/failed", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/failed", TestConnection, NULL,
               setup_connection, test_failed_connection, teardown_connection);
-  g_test_add ("/tls/connection/socket-client", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/socket-client", TestConnection, NULL,
               setup_connection, test_connection_socket_client, teardown_connection);
-  g_test_add ("/tls/connection/socket-client-failed", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/socket-client-failed", TestConnection, NULL,
               setup_connection, test_connection_socket_client_failed, teardown_connection);
-  g_test_add ("/tls/connection/read-time-out-then-write", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/read-time-out-then-write", TestConnection, NULL,
               setup_connection, test_connection_read_time_out_write, teardown_connection);
-  g_test_add ("/tls/connection/simultaneous-async", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/simultaneous-async", TestConnection, NULL,
               setup_connection, test_simultaneous_async, teardown_connection);
-  g_test_add ("/tls/connection/simultaneous-sync", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/simultaneous-sync", TestConnection, NULL,
               setup_connection, test_simultaneous_sync, teardown_connection);
-  g_test_add ("/tls/connection/simultaneous-async-rehandshake", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/simultaneous-async-rehandshake", TestConnection, NULL,
               setup_connection, test_simultaneous_async_rehandshake, teardown_connection);
-  g_test_add ("/tls/connection/simultaneous-sync-rehandshake", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/simultaneous-sync-rehandshake", TestConnection, NULL,
               setup_connection, test_simultaneous_sync_rehandshake, teardown_connection);
-  g_test_add ("/tls/connection/close-immediately", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/close-immediately", TestConnection, NULL,
               setup_connection, test_close_immediately, teardown_connection);
-  g_test_add ("/tls/connection/async-implicit-handshake", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/async-implicit-handshake", TestConnection, NULL,
               setup_connection, test_async_implicit_handshake, teardown_connection);
-  g_test_add ("/tls/connection/output-stream-close", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/output-stream-close", TestConnection, NULL,
               setup_connection, test_output_stream_close, teardown_connection);
-  g_test_add ("/tls/connection/fallback", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/fallback", TestConnection, NULL,
               setup_connection, test_fallback, teardown_connection);
-  g_test_add ("/tls/connection/garbage-database", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/garbage-database", TestConnection, NULL,
               setup_connection, test_garbage_database, teardown_connection);
-  g_test_add ("/tls/connection/readwrite-after-connection-destroyed", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/readwrite-after-connection-destroyed", TestConnection, NULL,
               setup_connection, test_readwrite_after_connection_destroyed, teardown_connection);
-  g_test_add ("/tls/connection/alpn/match", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/alpn/match", TestConnection, NULL,
               setup_connection, test_alpn_match, teardown_connection);
-  g_test_add ("/tls/connection/alpn/no-match", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/alpn/no-match", TestConnection, NULL,
               setup_connection, test_alpn_no_match, teardown_connection);
-  g_test_add ("/tls/connection/alpn/client-only", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/alpn/client-only", TestConnection, NULL,
               setup_connection, test_alpn_client_only, teardown_connection);
-  g_test_add ("/tls/connection/alpn/server-only", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/alpn/server-only", TestConnection, NULL,
               setup_connection, test_alpn_server_only, teardown_connection);
-  g_test_add ("/tls/connection/sync-op-during-handshake", TestConnection, NULL,
+  g_test_add ("/tls/" BACKEND "/connection/sync-op-during-handshake", TestConnection, NULL,
               setup_connection, test_sync_op_during_handshake, teardown_connection);
 
   ret = g_test_run ();
diff --git a/tls/tests/dtls-connection.c b/tls/tests/dtls-connection.c
index 7006340..ca830ea 100644
--- a/tls/tests/dtls-connection.c
+++ b/tls/tests/dtls-connection.c
@@ -866,37 +866,37 @@ main (int   argc,
   g_setenv ("GIO_USE_TLS", BACKEND, TRUE);
   g_assert (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 
0);
 
-  g_test_add ("/dtls/connection/basic/blocking", TestConnection, &blocking,
+  g_test_add ("/dtls/" BACKEND "/connection/basic/blocking", TestConnection, &blocking,
               setup_connection, test_basic_connection, teardown_connection);
-  g_test_add ("/dtls/connection/basic/timeout", TestConnection, &server_timeout,
+  g_test_add ("/dtls/" BACKEND "/connection/basic/timeout", TestConnection, &server_timeout,
               setup_connection, test_basic_connection, teardown_connection);
-  g_test_add ("/dtls/connection/basic/nonblocking",
+  g_test_add ("/dtls/" BACKEND "/connection/basic/nonblocking",
               TestConnection, &nonblocking,
               setup_connection, test_basic_connection, teardown_connection);
 
-  g_test_add ("/dtls/connection/threaded/blocking", TestConnection, &blocking,
+  g_test_add ("/dtls/" BACKEND "/connection/threaded/blocking", TestConnection, &blocking,
               setup_connection, test_threaded_connection, teardown_connection);
-  g_test_add ("/dtls/connection/threaded/timeout",
+  g_test_add ("/dtls/" BACKEND "/connection/threaded/timeout",
               TestConnection, &server_timeout,
               setup_connection, test_threaded_connection, teardown_connection);
-  g_test_add ("/dtls/connection/threaded/nonblocking",
+  g_test_add ("/dtls/" BACKEND "/connection/threaded/nonblocking",
               TestConnection, &nonblocking,
               setup_connection, test_threaded_connection, teardown_connection);
 
-  g_test_add ("/dtls/connection/timeouts/read", TestConnection, &client_timeout,
+  g_test_add ("/dtls/" BACKEND "/connection/timeouts/read", TestConnection, &client_timeout,
               setup_connection, test_connection_timeouts_read,
               teardown_connection);
 
-  g_test_add ("/dtls/connection/alpn/match", TestConnection, &blocking,
+  g_test_add ("/dtls/" BACKEND "/connection/alpn/match", TestConnection, &blocking,
               setup_connection, test_alpn_match,
               teardown_connection);
-  g_test_add ("/dtls/connection/alpn/no-match", TestConnection, &blocking,
+  g_test_add ("/dtls/" BACKEND "/connection/alpn/no-match", TestConnection, &blocking,
               setup_connection, test_alpn_no_match,
               teardown_connection);
-  g_test_add ("/dtls/connection/alpn/client-only", TestConnection, &blocking,
+  g_test_add ("/dtls/" BACKEND "/connection/alpn/client-only", TestConnection, &blocking,
               setup_connection, test_alpn_client_only,
               teardown_connection);
-  g_test_add ("/dtls/connection/alpn/server-only", TestConnection, &blocking,
+  g_test_add ("/dtls/" BACKEND "/connection/alpn/server-only", TestConnection, &blocking,
               setup_connection, test_alpn_server_only,
               teardown_connection);
 
diff --git a/tls/tests/file-database.c b/tls/tests/file-database.c
index 10fe84e..ba1da86 100644
--- a/tls/tests/file-database.c
+++ b/tls/tests/file-database.c
@@ -546,32 +546,32 @@ main (int   argc,
   g_setenv ("GIO_USE_TLS", BACKEND, TRUE);
   g_assert (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 
0);
 
-  g_test_add_func ("/tls/backend/default-database-is-singleton",
+  g_test_add_func ("/tls/" BACKEND "/backend/default-database-is-singleton",
                    test_default_database_is_singleton);
 
-  g_test_add ("/tls/database/verify-good", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/database/verify-good", TestVerify, NULL,
               setup_verify, test_verify_database_good, teardown_verify);
-  g_test_add ("/tls/database/verify-bad-identity", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/database/verify-bad-identity", TestVerify, NULL,
               setup_verify, test_verify_database_bad_identity, teardown_verify);
-  g_test_add ("/tls/database/verify-bad-ca", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/database/verify-bad-ca", TestVerify, NULL,
               setup_verify, test_verify_database_bad_ca, teardown_verify);
-  g_test_add ("/tls/database/verify-bad-before", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/database/verify-bad-before", TestVerify, NULL,
               setup_verify, test_verify_database_bad_before, teardown_verify);
-  g_test_add ("/tls/database/verify-bad-expired", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/database/verify-bad-expired", TestVerify, NULL,
               setup_verify, test_verify_database_bad_expired, teardown_verify);
-  g_test_add ("/tls/database/verify-bad-combo", TestVerify, NULL,
+  g_test_add ("/tls/" BACKEND "/database/verify-bad-combo", TestVerify, NULL,
               setup_verify, test_verify_database_bad_combo, teardown_verify);
-  g_test_add_func ("/tls/database/verify-with-incorrect-root-in-chain",
+  g_test_add_func ("/tls/" BACKEND "/database/verify-with-incorrect-root-in-chain",
                    test_verify_with_incorrect_root_in_chain);
 
-  g_test_add_func ("/tls/file-database/anchors-property",
+  g_test_add_func ("/tls/" BACKEND "/file-database/anchors-property",
                    test_anchors_property);
-  g_test_add_func ("/tls/file-database/lookup-certificates-issued-by",
+  g_test_add_func ("/tls/" BACKEND "/file-database/lookup-certificates-issued-by",
                    test_lookup_certificates_issued_by);
 
-  g_test_add ("/tls/file-database/test-handle", TestFileDatabase, NULL,
+  g_test_add ("/tls/" BACKEND "/file-database/test-handle", TestFileDatabase, NULL,
               setup_file_database, test_file_database_handle, teardown_file_database);
-  g_test_add ("/tls/file-database/test-handle-invalid", TestFileDatabase, NULL,
+  g_test_add ("/tls/" BACKEND "/file-database/test-handle-invalid", TestFileDatabase, NULL,
               setup_file_database, test_file_database_handle_invalid, teardown_file_database);
 
   return g_test_run();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]