Skip to content

Commit 0e4562a

Browse files
committed
ignore ipv6 tests
1 parent ea539b8 commit 0e4562a

File tree

7 files changed

+19
-42
lines changed

7 files changed

+19
-42
lines changed

cli/src/external_ip/providers/external_ip_resolver.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{
22
future::Future,
3-
net::{AddrParseError, Ipv4Addr, Ipv6Addr, TcpListener},
3+
net::{AddrParseError, Ipv4Addr, Ipv6Addr},
44
pin::Pin,
55
};
66

@@ -60,7 +60,3 @@ pub async fn resolve_ipv6_with_url<T: IntoUrl>(url: T) -> Result<Ipv6Addr, Exter
6060
let ip: Ipv6Addr = text.parse()?;
6161
Ok(ip)
6262
}
63-
64-
pub fn is_ipv6_available() -> bool {
65-
TcpListener::bind("[::1]:0").is_ok()
66-
}

cli/src/external_ip/providers/icanhazip.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ pub fn get_resolver() -> ProviderResolver {
2222

2323
#[cfg(test)]
2424
mod tests {
25-
use crate::external_ip::providers::external_ip_resolver::is_ipv6_available;
26-
2725
use super::*;
2826

2927
#[tokio::test]
@@ -32,12 +30,10 @@ mod tests {
3230
assert!(ip.is_ok());
3331
}
3432

33+
#[ignore = "Github runners don't support ipv6 request."]
3534
#[tokio::test]
3635
async fn test_ipv6() {
37-
if is_ipv6_available() {
38-
// Only run test if ipv6 is available on this system.
39-
let ip = resolve_ipv6().await;
40-
assert!(ip.is_ok());
41-
}
36+
let ip = resolve_ipv6().await;
37+
assert!(ip.is_ok());
4238
}
4339
}

cli/src/external_ip/providers/identme.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ pub fn get_resolver() -> ProviderResolver {
2222

2323
#[cfg(test)]
2424
mod tests {
25-
use crate::external_ip::providers::external_ip_resolver::is_ipv6_available;
26-
2725
use super::*;
2826

2927
#[tokio::test]
@@ -32,12 +30,10 @@ mod tests {
3230
assert!(ip.is_ok());
3331
}
3432

33+
#[ignore = "Github runners don't support ipv6 request."]
3534
#[tokio::test]
3635
async fn test_ipv6() {
37-
if is_ipv6_available() {
38-
// Only run test if ipv6 is available on this system.
39-
let ip = resolve_ipv6().await;
40-
assert!(ip.is_ok());
41-
}
36+
let ip = resolve_ipv6().await;
37+
assert!(ip.is_ok());
4238
}
4339
}

cli/src/external_ip/providers/ipifyorg.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ pub fn get_resolver() -> ProviderResolver {
2222

2323
#[cfg(test)]
2424
mod tests {
25-
use crate::external_ip::providers::external_ip_resolver::is_ipv6_available;
26-
2725
use super::*;
2826

2927
#[tokio::test]
@@ -32,12 +30,10 @@ mod tests {
3230
assert!(ip.is_ok());
3331
}
3432

33+
#[ignore = "Github runners don't support ipv6 request."]
3534
#[tokio::test]
3635
async fn test_ipv6() {
37-
if is_ipv6_available() {
38-
// Only run test if ipv6 is available on this system.
39-
let ip = resolve_ipv6().await;
40-
assert!(ip.is_ok());
41-
}
36+
let ip = resolve_ipv6().await;
37+
assert!(ip.is_ok());
4238
}
4339
}

cli/src/external_ip/providers/ipinfoio.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,18 @@ pub fn get_resolver() -> ProviderResolver {
3333

3434
#[cfg(test)]
3535
mod tests {
36-
use crate::external_ip::providers::external_ip_resolver::is_ipv6_available;
37-
3836
use super::*;
3937

4038
#[tokio::test]
4139
async fn test_ipv4() {
4240
let ip = resolve_ipv4().await;
43-
ip.expect("Valid ipv4");
41+
assert!(ip.is_ok());
4442
}
4543

44+
#[ignore = "Github runners don't support ipv6 request."]
4645
#[tokio::test]
4746
async fn test_ipv6() {
48-
if is_ipv6_available() {
49-
// Only run test if ipv6 is available on this system.
50-
let ip = resolve_ipv6().await;
51-
assert!(ip.is_ok());
52-
}
47+
let ip = resolve_ipv6().await;
48+
assert!(ip.is_ok());
5349
}
5450
}

cli/src/external_ip/providers/myip.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,18 @@ pub fn get_resolver() -> ProviderResolver {
3333

3434
#[cfg(test)]
3535
mod tests {
36-
use crate::external_ip::providers::external_ip_resolver::is_ipv6_available;
37-
3836
use super::*;
3937

4038
#[tokio::test]
4139
async fn test_ipv4() {
4240
let ip = resolve_ipv4().await;
43-
ip.expect("Valid ipv4");
41+
assert!(ip.is_ok());
4442
}
4543

44+
#[ignore = "Github runners don't support ipv6 request."]
4645
#[tokio::test]
4746
async fn test_ipv6() {
48-
if is_ipv6_available() {
49-
// Only run test if ipv6 is available on this system.
50-
let ip = resolve_ipv6().await;
51-
assert!(ip.is_ok());
52-
}
47+
let ip = resolve_ipv6().await;
48+
assert!(ip.is_ok());
5349
}
5450
}

cli/src/external_ip/resolver.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ mod tests {
6565
println!("{:?}", ip.expect("Valid ipv4"));
6666
}
6767

68+
#[ignore = "Github runners don't support ipv6 request."]
6869
#[tokio::test]
6970
async fn test_ipv6() {
7071
let ip = resolve_ipv6().await;

0 commit comments

Comments
 (0)