octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert unnecessary change in sync_until

This commit is contained in:
Jane Lusby 2020-10-29 18:05:39 -07:00 committed by Deirdre Connolly
parent 9fd38f29b4
commit 0f51891359
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebrad/tests/acceptance.rs
View File

@ -614,10 +614,9 @@ fn sync_until(
network: Network, network: Network,
stop_regex: &str, stop_regex: &str,
timeout: Duration, timeout: Duration,
reuse_tempdir: impl Into<Option<TempDir>>, reuse_tempdir: Option<TempDir>,
) -> Result<TempDir> { ) -> Result<TempDir> {
zebra_test::init(); zebra_test::init();
let reuse_tempdir = reuse_tempdir.into();
if env::var_os("ZEBRA_SKIP_NETWORK_TESTS").is_some() { if env::var_os("ZEBRA_SKIP_NETWORK_TESTS").is_some() {
// This message is captured by the test runner, use // This message is captured by the test runner, use
@ -668,6 +667,7 @@ fn create_cached_database_height(network: Network, height: Height) -> Result<()>
config.network.network = network; config.network.network = network;
config.state.debug_stop_at_height = Some(height.0); config.state.debug_stop_at_height = Some(height.0);
let dir = PathBuf::from("/"); let dir = PathBuf::from("/");
fs::File::create(dir.join("zebrad.toml"))?.write_all(toml::to_string(&config)?.as_bytes())?; fs::File::create(dir.join("zebrad.toml"))?.write_all(toml::to_string(&config)?.as_bytes())?;
let mut child = dir.spawn_child(&["start"])?.with_timeout(timeout); let mut child = dir.spawn_child(&["start"])?.with_timeout(timeout);