Skip to content

Commit

Permalink
Merge of #3627
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Feb 24, 2022
2 parents e75fe2c + 4cb28f1 commit eb914c6
Showing 1 changed file with 19 additions and 6 deletions.
25 changes: 19 additions & 6 deletions zebrad/tests/acceptance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ use color_eyre::{
};
use tempfile::TempDir;

use std::{
collections::HashSet, convert::TryInto, env, net::SocketAddr, path::Path, path::PathBuf,
time::Duration,
};
use std::{collections::HashSet, convert::TryInto, env, path::Path, path::PathBuf, time::Duration};

use zebra_chain::{
block::Height,
Expand Down Expand Up @@ -1459,13 +1456,29 @@ async fn tracing_endpoint() -> Result<()> {

/// Launch `zebrad` with an RPC port, and make sure `lightwalletd` works with Zebra.
///
/// This test doesn't work on Windows, and it is ignored by default on other platforms.
/// This test only runs when the `ZEBRA_TEST_LIGHTWALLETD` env var is set.
///
/// This test doesn't work on Windows, so it is always skipped on that platform.
#[test]
#[ignore]
#[cfg(not(target_os = "windows"))]
fn lightwalletd_integration() -> Result<()> {
use std::net::SocketAddr;

zebra_test::init();

// Skip the test unless we specifically asked for it
//
// TODO: check if the lightwalletd binary is in the PATH?
// (this doesn't seem to be implemented in the standard library)
if env::var("ZEBRA_TEST_LIGHTWALLETD").is_err() {
tracing::info!(
"skipped lightwalletd integration test, \
set the 'ZEBRA_TEST_LIGHTWALLETD' environmental variable to run the test",
);

return Ok(());
}

// Launch zebrad

// [Note on port conflict](#Note on port conflict)
Expand Down

0 comments on commit eb914c6

Please sign in to comment.