s4-torture: rename torture_suite_add_ndr_pullpush_test to torture_suite_add_ndr_pull_validate_test.

Hoping the new name is not as confusing as the old name.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

8 files changed, 15 insertions, 15 deletions

diff --git a/source4/torture/ndr/backupkey.c b/source4/torture/ndr/backupkey.c
index 972d676d3e4..abf34ac925e 100644
--- a/source4/torture/ndr/backupkey.c
+++ b/source4/torture/ndr/backupkey.c
@@ -154,7 +154,7 @@ struct torture_suite *ndr_backupkey_suite(TALLOC_CTX *ctx)
 {
 	struct torture_suite *suite = torture_suite_create(ctx, "backupkey");
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    bkrp_exported_RSA_key_pair,
 					    data_blob_const(exported_rsa_ndr,
 							    sizeof(exported_rsa_ndr)),
diff --git a/source4/torture/ndr/clusapi.c b/source4/torture/ndr/clusapi.c
index f1156d0e1e3..3fe84db5ace 100644
--- a/source4/torture/ndr/clusapi.c
+++ b/source4/torture/ndr/clusapi.c
@@ -369,12 +369,12 @@ struct torture_suite *ndr_clusapi_suite(TALLOC_CTX *ctx)
 {
 	struct torture_suite *suite = torture_suite_create(ctx, "clusapi");
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    clusapi_PROPERTY_LIST,
 					    data_blob_const(clusapi_PROPERTY_LIST_data,sizeof(clusapi_PROPERTY_LIST_data)),
 					    clusapi_PROPERTY_LIST_check);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    clusapi_PROPERTY_LIST,
 					    data_blob_const(clusapi_PROPERTY_LIST_data2,sizeof(clusapi_PROPERTY_LIST_data2)),
 					    clusapi_PROPERTY_LIST_check2);
diff --git a/source4/torture/ndr/drsblobs.c b/source4/torture/ndr/drsblobs.c
index ecdc01449cc..b8934e1a415 100644
--- a/source4/torture/ndr/drsblobs.c
+++ b/source4/torture/ndr/drsblobs.c
@@ -187,12 +187,12 @@ struct torture_suite *ndr_drsblobs_suite(TALLOC_CTX *ctx)
 	torture_suite_add_ndr_pull_test(suite, ForestTrustInfo, forest_trust_info_data_out, forest_trust_info_check_out);
 	torture_suite_add_ndr_pull_test(suite, trustDomainPasswords, trust_domain_passwords_in, trust_domain_passwords_check_in);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    trustAuthInOutBlob,
 					    base64_decode_data_blob_talloc(suite, trustAuthIncoming),
 					    NULL);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    trustAuthInOutBlob,
 					    base64_decode_data_blob_talloc(suite, trustAuthOutgoing),
 					    NULL);
diff --git a/source4/torture/ndr/nbt.c b/source4/torture/ndr/nbt.c
index 9ccdfe88b7d..48f8c1087dc 100644
--- a/source4/torture/ndr/nbt.c
+++ b/source4/torture/ndr/nbt.c
@@ -229,22 +229,22 @@ struct torture_suite *ndr_nbt_suite(TALLOC_CTX *ctx)
 					netlogon_samlogon_response_data,
 					netlogon_samlogon_response_check);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    netlogon_samlogon_response,
 					    data_blob_const(netlogon_samlogon_response_data, sizeof(netlogon_samlogon_response_data)),
 					    netlogon_samlogon_response_check);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    nbt_netlogon_packet,
 					    data_blob_const(nbt_netlogon_packet_data, sizeof(nbt_netlogon_packet_data)),
 					    nbt_netlogon_packet_check);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    nbt_netlogon_packet,
 					    data_blob_const(nbt_netlogon_packet_logon_primary_query_data, sizeof(nbt_netlogon_packet_logon_primary_query_data)),
 					    nbt_netlogon_packet_logon_primary_query_check);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    netlogon_samlogon_response,
 					    data_blob_const(netlogon_samlogon_response_data2, sizeof(netlogon_samlogon_response_data2)),
 					    netlogon_samlogon_response_check2);
diff --git a/source4/torture/ndr/ndr.h b/source4/torture/ndr/ndr.h
index b08383b4345..37ee9f6eb23 100644
--- a/source4/torture/ndr/ndr.h
+++ b/source4/torture/ndr/ndr.h
@@ -70,8 +70,8 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_inout_test(
 			 flags, flags2, \
 			 (bool (*) (struct torture_context *, void *)) check_fn);
 
-#define torture_suite_add_ndr_pullpush_test(suite,name,data_blob,check_fn) \
-		_torture_suite_add_ndr_pullpush_test(suite, #name, \
+#define torture_suite_add_ndr_pull_validate_test(suite,name,data_blob,check_fn) \
+		_torture_suite_add_ndr_pullpush_test(suite, #name "_VALIDATE", \
 			 (ndr_pull_flags_fn_t)ndr_pull_ ## name, \
 			 (ndr_push_flags_fn_t)ndr_push_ ## name, \
 			 data_blob, \
diff --git a/source4/torture/ndr/negoex.c b/source4/torture/ndr/negoex.c
index db94cb31d52..cad45748611 100644
--- a/source4/torture/ndr/negoex.c
+++ b/source4/torture/ndr/negoex.c
@@ -92,7 +92,7 @@ struct torture_suite *ndr_negoex_suite(TALLOC_CTX *ctx)
 {
 	struct torture_suite *suite = torture_suite_create(ctx, "negoex");
 
-	torture_suite_add_ndr_pullpush_test(suite, negoex_MESSAGE_ARRAY,
+	torture_suite_add_ndr_pull_validate_test(suite, negoex_MESSAGE_ARRAY,
 					    data_blob_const(negoex_MESSAGE_ARRAY_data, sizeof(negoex_MESSAGE_ARRAY_data)),
 					    negoex_MESSAGE_ARRAY_check);
 
diff --git a/source4/torture/ndr/ntlmssp.c b/source4/torture/ndr/ntlmssp.c
index aeac26ffe57..7e42166eb0f 100644
--- a/source4/torture/ndr/ntlmssp.c
+++ b/source4/torture/ndr/ntlmssp.c
@@ -282,12 +282,12 @@ struct torture_suite *ndr_ntlmssp_suite(TALLOC_CTX *ctx)
 	torture_suite_add_ndr_pull_test(suite, CHALLENGE_MESSAGE, ntlmssp_CHALLENGE_MESSAGE_data, ntlmssp_CHALLENGE_MESSAGE_check);
 	torture_suite_add_ndr_pull_test(suite, AUTHENTICATE_MESSAGE, ntlmssp_AUTHENTICATE_MESSAGE_data, ntlmssp_AUTHENTICATE_MESSAGE_check);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    NEGOTIATE_MESSAGE,
 					    data_blob_const(ntlmssp_NEGOTIATE_MESSAGE_data, sizeof(ntlmssp_NEGOTIATE_MESSAGE_data)),
 					    ntlmssp_NEGOTIATE_MESSAGE_check);
 
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    CHALLENGE_MESSAGE,
 					    data_blob_const(ntlmssp_CHALLENGE_MESSAGE_data, sizeof(ntlmssp_CHALLENGE_MESSAGE_data)),
 					    ntlmssp_CHALLENGE_MESSAGE_check);
diff --git a/source4/torture/ndr/ntprinting.c b/source4/torture/ndr/ntprinting.c
index 3ff9cb12eee..531e0040abd 100644
--- a/source4/torture/ndr/ntprinting.c
+++ b/source4/torture/ndr/ntprinting.c
@@ -648,7 +648,7 @@ struct torture_suite *ndr_ntprinting_suite(TALLOC_CTX *ctx)
 					ntprinting_printer_check);
 
 	/* pullpush not working atm.
-	torture_suite_add_ndr_pullpush_test(suite,
+	torture_suite_add_ndr_pull_validate_test(suite,
 					    ntprinting_printer,
 					    data_blob_const(ntprinting_printer_data, sizeof(ntprinting_printer_data)),
 					    ntprinting_printer_check);