Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Test

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
on: [ push, pull_request ]

env:
CARGO_TERM_COLOR: always
Expand All @@ -20,7 +16,7 @@ jobs:
- uses: Swatinem/rust-cache@v2

- name: Build
run: cargo build
run: cargo build --features ci

- name: Test
run: cargo test
run: cargo test --features ci
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ tokio = { version = "1.37.0", features = ["macros", "net", "rt-multi-thread", "s

[dev-dependencies]
pretty_assertions = "1.4.0"

[features]
ci = []
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ cargo add masterstat
```rust
use std::time::Duration;

let master = "master.quakeworld.nu:27000";
let timeout = Some(Duration::from_secs(2));

match masterstat::server_addresses(&master, timeout) {
Ok(addresses) => { println!("found {} server addresses", addresses.len()) },
Err(e) => { eprintln!("error: {}", e); }
async fn test() {
let master = "master.quakeworld.nu:27000";
let timeout = Duration::from_secs(2);
match masterstat::server_addresses(&master, timeout).await {
Ok(result) => { println!("found {} server addresses", result.len()) },
Err(e) => { eprintln!("error: {}", e); }
}
}
```

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

async fn test() {
let masters = ["master.quakeworld.nu:27000", "master.quakeservers.net:27000"];
let timeout = Some(Duration::from_secs(2));
let server_addresses = masterstat::server_addresses_from_many(&masters, timeout).await?;
let masters = ["master.quakeworld.nu:27000", "master.quakeservers.net:27000"];
let timeout = Duration::from_secs(2);
let result = masterstat::server_addresses_from_many(&masters, timeout).await;
println!("found {} server addresses", result.len());
}
```

Expand Down
9 changes: 5 additions & 4 deletions src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,25 +107,26 @@ fn sorted_and_unique(server_addresses: &[ServerAddress]) -> Vec<ServerAddress> {
#[cfg(test)]
mod tests {
use super::*;
// use pretty_assertions::assert_eq;
use pretty_assertions::assert_eq;

#[tokio::test]
#[cfg_attr(feature = "ci", ignore)]
async fn test_server_addresses() -> Result<()> {
let master = "master.quakeservers.net:27000";
let timeout = Duration::from_secs(1);
let timeout = Duration::from_secs(2);
let result = server_addresses(master, timeout).await?;
assert!(!result.is_empty());
Ok(())
}

#[tokio::test]
#[cfg_attr(feature = "ci", ignore)]
async fn test_server_addresses_from_many() -> Result<()> {
let masters = [
"master.quakeservers.net:27000",
"master.quakeworld.nu:27000",
"qwmaster.fodquake.net:27000",
];
let timeout = Duration::from_secs(1);
let timeout = Duration::from_secs(2);
let result = server_addresses_from_many(&masters, timeout).await;
assert!(result.len() > 500);
Ok(())
Expand Down