torture: Remove GETADDRINFO test

This was the only user of getaddrinfo_send and not run anyway

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/skip b/selftest/skip
index c2c4553c3fe3242a460fd43d68a1a69d0ce71efd..dd60ab5a1fbe7eef44eff387d534d6a618c4265d 100644 (file)
--- a/selftest/skip
+++ b/selftest/skip
@@ -145,4 +145,3 @@ bench # don't run benchmarks in our selftest
 ^samba4.blackbox.ktpass # this test isn't portable ...
 ^samba4.rpc.unixinfo # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
 ^samba.tests.dcerpc.unix  # This contains a server-side getpwuid call which hangs the server when nss_winbindd is in use
-GETADDRINFO # socket wrapper doesn't support threads

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 8efc42c58d000c7d4b8a0a388645a6f77d992642..c1e08d567318bde04f77ded013e39b1acecbdf0c 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -72,7 +72,7 @@ tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7"
         "OPEN", "XCOPY", "RENAME", "DELETE", "DELETE-LN", "WILDDELETE", "PROPERTIES", "W2K",
         "TCON2", "IOCTL", "CHKPATH", "FDSESS", "CHAIN1", "CHAIN2", "OWNER-RIGHTS",
         "CHAIN3", "PIDHIGH",
-        "GETADDRINFO", "UID-REGRESSION-TEST", "SHORTNAME-TEST",
+        "UID-REGRESSION-TEST", "SHORTNAME-TEST",
         "CASE-INSENSITIVE-CREATE", "SMB2-BASIC", "NTTRANS-FSCTL", "SMB2-NEGPROT",
         "SMB2-SESSION-REAUTH", "SMB2-SESSION-RECONNECT", "SMB2-FTRUNCATE",
         "CLEANUP1",

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index bb4908fd127ca5e51a910bbec4a07e09038e7019..360adad5953297d25be01d1b37d4ebdefd384b3f 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -10863,59 +10863,6 @@ static bool run_wbclient_multi_ping(int dummy)
        return result;
 }
 
-static void getaddrinfo_finished(struct tevent_req *req)
-{
-       char *name = (char *)tevent_req_callback_data_void(req);
-       struct addrinfo *ainfo;
-       int res;
-
-       res = getaddrinfo_recv(req, &ainfo);
-       if (res != 0) {
-               d_printf("gai(%s) returned %s\n", name, gai_strerror(res));
-               return;
-       }
-       d_printf("gai(%s) succeeded\n", name);
-       freeaddrinfo(ainfo);
-}
-
-static bool run_getaddrinfo_send(int dummy)
-{
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct fncall_context *ctx;
-       struct tevent_context *ev;
-       bool result = false;
-       const char *names[4] = { "www.samba.org", "notfound.samba.org",
-                                "www.slashdot.org", "heise.de" };
-       struct tevent_req *reqs[4];
-       int i;
-
-       ev = samba_tevent_context_init(frame);
-       if (ev == NULL) {
-               goto fail;
-       }
-
-       ctx = fncall_context_init(frame, 4);
-
-       for (i=0; i<ARRAY_SIZE(names); i++) {
-               reqs[i] = getaddrinfo_send(frame, ev, ctx, names[i], NULL,
-                                          NULL);
-               if (reqs[i] == NULL) {
-                       goto fail;
-               }
-               tevent_req_set_callback(reqs[i], getaddrinfo_finished,
-                                       discard_const_p(void, names[i]));
-       }
-
-       for (i=0; i<ARRAY_SIZE(reqs); i++) {
-               tevent_loop_once(ev);
-       }
-
-       result = true;
-fail:
-       TALLOC_FREE(frame);
-       return result;
-}
-
 static bool dbtrans_inc(struct db_context *db)
 {
        struct db_record *rec;
@@ -11576,7 +11523,6 @@ static struct {
        { "NTTRANS-CREATE", run_nttrans_create, 0},
        { "NTTRANS-FSCTL", run_nttrans_fsctl, 0},
        { "CLI_ECHO", run_cli_echo, 0},
-       { "GETADDRINFO", run_getaddrinfo_send, 0},
        { "TLDAP", run_tldap },
        { "STREAMERROR", run_streamerror },
        { "NOTIFY-BENCH", run_notify_bench },