zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(test): Skip editor files and other hidden files in test configs directory (#6796) 

* Skip editor files and other hidden files in test configs directory

* Also ignore files starting with `#`
This commit is contained in:
teor 2023-06-06 09:56:08 +10:00 committed by GitHub
parent a7b03228bc
commit 628ddd64ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
zebrad/tests/acceptance.rs
View File

@ -572,8 +572,8 @@ fn config_tests() -> Result<()> {
// Check that we have a current version of the config stored
last_config_is_stored()?;
// Check that Zebra stored configuration works
stored_configs_works()?;
// Check that Zebra's previous configurations still work
stored_configs_work()?;
// Runs `zebrad` serially to avoid potential port conflicts
app_no_args()?;
@ -702,13 +702,31 @@ fn last_config_is_stored() -> Result<()> {
.to_string();
// Loop all the stored configs
//
// TODO: use the same filename list code in last_config_is_stored() and stored_configs_work()
for config_file in configs_dir()
.read_dir()
.expect("read_dir call failed")
.flatten()
{
let config_file_path = config_file.path();
let config_file_name = config_file_path
.file_name()
.expect("config files must have a file name")
.to_string_lossy();
if config_file_name.as_ref().starts_with('.') || config_file_name.as_ref().starts_with('#')
{
// Skip editor files and other invalid config paths
tracing::info!(
?config_file_path,
"skipping hidden/temporary config file path"
);
continue;
}
// Read stored config
let stored_content = fs::read_to_string(config_file_full_path(config_file.path()))
let stored_content = fs::read_to_string(config_file_full_path(config_file_path))
.expect("Should have been able to read the file")
.trim()
.to_string();
@ -832,7 +850,7 @@ fn invalid_generated_config() -> Result<()> {
/// Test all versions of `zebrad.toml` we have stored can be parsed by the latest `zebrad`.
#[tracing::instrument]
fn stored_configs_works() -> Result<()> {
fn stored_configs_work() -> Result<()> {
let old_configs_dir = configs_dir();
for config_file in old_configs_dir
@ -840,15 +858,33 @@ fn stored_configs_works() -> Result<()> {
.expect("read_dir call failed")
.flatten()
{
let config_file_path = config_file.path();
let config_file_name = config_file_path
.file_name()
.expect("config files must have a file name")
.to_string_lossy();
if config_file_name.as_ref().starts_with('.') || config_file_name.as_ref().starts_with('#')
{
// Skip editor files and other invalid config paths
tracing::info!(
?config_file_path,
"skipping hidden/temporary config file path"
);
continue;
}
// ignore files starting with getblocktemplate prefix
// if we were not built with the getblocktemplate-rpcs feature.
#[cfg(not(feature = "getblocktemplate-rpcs"))]
if config_file
.file_name()
.into_string()
.expect("all files names should be string convertible")
if config_file_name
.as_ref()
.starts_with(GET_BLOCK_TEMPLATE_CONFIG_PREFIX)
{
tracing::info!(
?config_file_path,
"skipping getblocktemplate-rpcs config file path"
);
continue;
}