From 2aafe905f81a95eefc65e39220761922cb25a239 Mon Sep 17 00:00:00 2001 From: Scott Hutton Date: Thu, 7 Mar 2024 12:49:25 -0800 Subject: [PATCH] Dump routing table for unit test --- .github/workflows/rust.yml | 4 ++-- src/lib.rs | 2 ++ src/routing_table.rs | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ca45069..74c72c3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,6 +17,6 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build - run: cargo build --verbose + run: cargo build - name: Run tests - run: cargo test --verbose + run: cargo test --nocapture diff --git a/src/lib.rs b/src/lib.rs index 98bea75..d10036f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,6 +4,8 @@ mod routing_table; use std::fmt::Write; +pub use routing_table::execute_netstat; + // Exports pub use route_entry::RouteEntry; pub use routing_flag::RoutingFlag; diff --git a/src/routing_table.rs b/src/routing_table.rs index 067940c..7802b29 100644 --- a/src/routing_table.rs +++ b/src/routing_table.rs @@ -41,7 +41,7 @@ impl RoutingTable { /// Returns an error if the `netstat` command fails to execute, or returns /// unparseable output. pub async fn load_from_netstat() -> Result { - let output = query_netstat_routing_table().await?; + let output = execute_netstat().await?; Self::from_netstat_output(&output) } @@ -122,7 +122,8 @@ impl RoutingTable { } } -async fn query_netstat_routing_table() -> Result { +/// Execute `netstat -rn` and return the output +pub async fn execute_netstat() -> Result { let output = Command::new(NETSTAT_PATH) .arg("-rn") .stdin(std::process::Stdio::null())