Skip to content

Commit 718d2ff

Browse files
BertBert
Bert
authored and
Bert
committed
GH-524: DNS disabled in ServerInitializerReal poll(); two integration tests put in ignore
1 parent 50f007e commit 718d2ff

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

node/src/server_initializer.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use time::OffsetDateTime;
2828
use tokio::prelude::{Async, Future};
2929

3030
pub struct ServerInitializerReal {
31+
#[allow(dead_code)]
3132
dns_socket_server: Box<dyn ConfiguredByPrivilege<Item = (), Error = ()>>,
3233
bootstrapper: Box<dyn ConfiguredByPrivilege<Item = (), Error = ()>>,
3334
privilege_dropper: Box<dyn PrivilegeDropper>,
@@ -80,11 +81,12 @@ impl Future for ServerInitializerReal {
8081
type Error = ();
8182

8283
fn poll(&mut self) -> Result<Async<<Self as Future>::Item>, <Self as Future>::Error> {
83-
try_ready!(self
84-
.dns_socket_server
85-
.as_mut()
86-
.join(self.bootstrapper.as_mut())
87-
.poll());
84+
// try_ready!(self
85+
// .dns_socket_server
86+
// .as_mut()
87+
// .join(self.bootstrapper.as_mut())
88+
// .poll());
89+
try_ready!(self.bootstrapper.as_mut().poll());
8890
Ok(Async::Ready(()))
8991
}
9092
}

node/tests/dns_round_trip_test.rs

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ use trust_dns::op::{OpCode, ResponseCode};
99
use trust_dns::rr::{DNSClass, RecordType};
1010

1111
#[test]
12+
// TODO This ignore should be lifted by GH-525
13+
#[ignore]
1214
#[serial(port53)]
1315
fn handles_two_consecutive_ipv4_dns_requests_integration() {
1416
let _node = utils::MASQNode::start_standard(
@@ -25,6 +27,8 @@ fn handles_two_consecutive_ipv4_dns_requests_integration() {
2527
}
2628

2729
#[test]
30+
// TODO This ignore should be lifted by GH-525
31+
#[ignore]
2832
#[serial(port53)]
2933
fn handles_consecutive_heterogeneous_dns_requests_integration() {
3034
let _node = utils::MASQNode::start_standard(

0 commit comments

Comments
 (0)