[PR #440] [CLOSED] More tokio clenaups #1437

New issue

Closed

opened 2026-03-16 02:06:29 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 02:06:29 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/440
Author: @Keruspe
Created: 4/30/2018
Status: ❌ Closed

Base: master ← Head: tokio-executor

📝 Commits (6)

7775983 proto: switch back to tokio_executor::spawn
f4dec96 resolver: fix some tests
4d27a6e resolver: fix tests
ceb7a5e make ClientFuture::new return a Future
9e032f7 fix integration tests
4aa0b7f update tokio

📊 Changes

21 files changed (+315 additions, -192 deletions)

View changed files

📝 Cargo.lock (+26 -14)
📝 client/src/client/client.rs (+25 -13)
📝 client/src/client/client_future.rs (+15 -13)
📝 integration-tests/tests/client_future_tests.rs (+30 -21)
📝 integration-tests/tests/lookup_tests.rs (+26 -16)
📝 integration-tests/tests/mdns_tests.rs (+4 -2)
📝 integration-tests/tests/secure_client_handle_tests.rs (+6 -3)
📝 proto/Cargo.toml (+1 -1)
📝 proto/src/lib.rs (+1 -1)
📝 proto/src/xfer/dns_future.rs (+4 -8)
📝 proto/src/xfer/secure_dns_handle.rs (+11 -11)
📝 resolver/src/dns_sd.rs (+1 -0)
📝 resolver/src/lib.rs (+2 -0)
📝 resolver/src/name_server_pool.rs (+22 -14)
📝 resolver/src/resolver.rs (+20 -7)
📝 resolver/src/resolver_future.rs (+76 -47)
📝 resolver/src/tls/mod.rs (+1 -0)
📝 server/src/server/server_future.rs (+4 -4)
📝 server/tests/z_named_native_tls_tests.rs (+4 -2)
📝 server/tests/z_named_test_rsa_dnssec.rs (+6 -1)

...and 1 more files

📄 Description

Part of #385
Based on #439

Nearly all tests now pass without the threading + run hack, using tokio_executor::spawn.

The server tests hang for some reasons and I won't be able to debug that today I think, all the other ones pass

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/440 **Author:** [@Keruspe](https://github.com/Keruspe) **Created:** 4/30/2018 **Status:** ❌ Closed **Base:** `master` ← **Head:** `tokio-executor` --- ### 📝 Commits (6) - [`7775983`](https://github.com/hickory-dns/hickory-dns/commit/77759834dc734cb74a8e8b616a4ea078b29fca48) proto: switch back to tokio_executor::spawn - [`f4dec96`](https://github.com/hickory-dns/hickory-dns/commit/f4dec9617b9c97185d64eb0c00f3957147a93d9d) resolver: fix some tests - [`4d27a6e`](https://github.com/hickory-dns/hickory-dns/commit/4d27a6e4bbda250873349007121eba35337f7e76) resolver: fix tests - [`ceb7a5e`](https://github.com/hickory-dns/hickory-dns/commit/ceb7a5e66a539bf25a613aa0e3f5986ecaed9d59) make ClientFuture::new return a Future - [`9e032f7`](https://github.com/hickory-dns/hickory-dns/commit/9e032f74b6e4d3a15dc2a332d8f257c7449ec5e5) fix integration tests - [`4aa0b7f`](https://github.com/hickory-dns/hickory-dns/commit/4aa0b7f58ab221d75140f87fca663eeafe255937) update tokio ### 📊 Changes **21 files changed** (+315 additions, -192 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+26 -14) 📝 `client/src/client/client.rs` (+25 -13) 📝 `client/src/client/client_future.rs` (+15 -13) 📝 `integration-tests/tests/client_future_tests.rs` (+30 -21) 📝 `integration-tests/tests/lookup_tests.rs` (+26 -16) 📝 `integration-tests/tests/mdns_tests.rs` (+4 -2) 📝 `integration-tests/tests/secure_client_handle_tests.rs` (+6 -3) 📝 `proto/Cargo.toml` (+1 -1) 📝 `proto/src/lib.rs` (+1 -1) 📝 `proto/src/xfer/dns_future.rs` (+4 -8) 📝 `proto/src/xfer/secure_dns_handle.rs` (+11 -11) 📝 `resolver/src/dns_sd.rs` (+1 -0) 📝 `resolver/src/lib.rs` (+2 -0) 📝 `resolver/src/name_server_pool.rs` (+22 -14) 📝 `resolver/src/resolver.rs` (+20 -7) 📝 `resolver/src/resolver_future.rs` (+76 -47) 📝 `resolver/src/tls/mod.rs` (+1 -0) 📝 `server/src/server/server_future.rs` (+4 -4) 📝 `server/tests/z_named_native_tls_tests.rs` (+4 -2) 📝 `server/tests/z_named_test_rsa_dnssec.rs` (+6 -1) _...and 1 more files_ </details> ### 📄 Description Part of #385 Based on #439 Nearly all tests now pass without the threading + run hack, using tokio_executor::spawn. The server tests hang for some reasons and I won't be able to debug that today I think, all the other ones pass --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>