Skip to content

Commit 2bd378a

Browse files
authored
Ignore certain tests when run on GitHub CI (#2)
1 parent ee10645 commit 2bd378a

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: Test
22

3-
on:
4-
push:
5-
branches: [ "main" ]
6-
pull_request:
7-
branches: [ "main" ]
3+
on: [ push, pull_request ]
84

95
env:
106
CARGO_TERM_COLOR: always
@@ -20,7 +16,7 @@ jobs:
2016
- uses: Swatinem/rust-cache@v2
2117

2218
- name: Build
23-
run: cargo build
19+
run: cargo build --features ci
2420

2521
- name: Test
26-
run: cargo test
22+
run: cargo test --features ci

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ tokio = { version = "1.37.0", features = ["macros", "net", "rt-multi-thread", "s
2626

2727
[dev-dependencies]
2828
pretty_assertions = "1.4.0"
29+
30+
[features]
31+
ci = []

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ cargo add masterstat
1515
```rust
1616
use std::time::Duration;
1717

18-
let master = "master.quakeworld.nu:27000";
19-
let timeout = Some(Duration::from_secs(2));
20-
21-
match masterstat::server_addresses(&master, timeout) {
22-
Ok(addresses) => { println!("found {} server addresses", addresses.len()) },
23-
Err(e) => { eprintln!("error: {}", e); }
18+
async fn test() {
19+
let master = "master.quakeworld.nu:27000";
20+
let timeout = Duration::from_secs(2);
21+
match masterstat::server_addresses(&master, timeout).await {
22+
Ok(result) => { println!("found {} server addresses", result.len()) },
23+
Err(e) => { eprintln!("error: {}", e); }
24+
}
2425
}
2526
```
2627

@@ -30,9 +31,10 @@ match masterstat::server_addresses(&master, timeout) {
3031
use std::time::Duration;
3132

3233
async fn test() {
33-
let masters = ["master.quakeworld.nu:27000", "master.quakeservers.net:27000"];
34-
let timeout = Some(Duration::from_secs(2));
35-
let server_addresses = masterstat::server_addresses_from_many(&masters, timeout).await?;
34+
let masters = ["master.quakeworld.nu:27000", "master.quakeservers.net:27000"];
35+
let timeout = Duration::from_secs(2);
36+
let result = masterstat::server_addresses_from_many(&masters, timeout).await;
37+
println!("found {} server addresses", result.len());
3638
}
3739
```
3840

src/command.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,25 +107,26 @@ fn sorted_and_unique(server_addresses: &[ServerAddress]) -> Vec<ServerAddress> {
107107
#[cfg(test)]
108108
mod tests {
109109
use super::*;
110-
// use pretty_assertions::assert_eq;
110+
use pretty_assertions::assert_eq;
111111

112112
#[tokio::test]
113+
#[cfg_attr(feature = "ci", ignore)]
113114
async fn test_server_addresses() -> Result<()> {
114115
let master = "master.quakeservers.net:27000";
115-
let timeout = Duration::from_secs(1);
116+
let timeout = Duration::from_secs(2);
116117
let result = server_addresses(master, timeout).await?;
117118
assert!(!result.is_empty());
118119
Ok(())
119120
}
120121

121122
#[tokio::test]
123+
#[cfg_attr(feature = "ci", ignore)]
122124
async fn test_server_addresses_from_many() -> Result<()> {
123125
let masters = [
124126
"master.quakeservers.net:27000",
125127
"master.quakeworld.nu:27000",
126-
"qwmaster.fodquake.net:27000",
127128
];
128-
let timeout = Duration::from_secs(1);
129+
let timeout = Duration::from_secs(2);
129130
let result = server_addresses_from_many(&masters, timeout).await;
130131
assert!(result.len() > 500);
131132
Ok(())

0 commit comments

Comments
 (0)