cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

tests.nixpkgs-check-by-name: Intermediate InvalidShardName error

Browse source
This commit is contained in:
Silvan Mosberger 2023-10-20 01:15:18 +02:00
parent 143e267ad2
commit b7ace0198c
2 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/test/nixpkgs-check-by-name/src/check_result.rs
View file

@ -8,6 +8,10 @@ use std::io;
use std::path::PathBuf;
pub enum CheckError {
InvalidShardName {
relative_shard_path: PathBuf,
shard_name: String,
},
PackageNonDir {
relative_package_dir: PathBuf,
},
@ -92,6 +96,12 @@ impl CheckError {
impl fmt::Display for CheckError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
CheckError::InvalidShardName { relative_shard_path, shard_name } =>
write!(
f,
"{}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".",
relative_shard_path.display()
),
CheckError::PackageNonDir { relative_package_dir } =>
write!(
f,

37
pkgs/test/nixpkgs-check-by-name/src/structure.rs
View file

@ -71,12 +71,17 @@ impl Nixpkgs {
}
let shard_name_valid = SHARD_NAME_REGEX.is_match(&shard_name);
if !shard_name_valid {
error_writer.write(&format!(
"{}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".",
relative_shard_path.display()
))?;
}
let shard_name_valid_check_result = if !shard_name_valid {
CheckError::InvalidShardName {
relative_shard_path: relative_shard_path.clone(),
shard_name: shard_name.clone(),
}
.into_result()
} else {
pass(())
};
write_check_result(error_writer, shard_name_valid_check_result)?;
let entries = utils::read_dir_sorted(&shard_path)?;
@ -99,13 +104,13 @@ impl Nixpkgs {
write_check_result(error_writer, duplicate_check_result)?;
for package_entry in entries {
let check_results = entries.into_iter().map(|package_entry| {
let package_path = package_entry.path();
let package_name = package_entry.file_name().to_string_lossy().into_owned();
let relative_package_dir =
PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}/{package_name}"));
let check_result = if !package_path.is_dir() {
if !package_path.is_dir() {
CheckError::PackageNonDir {
relative_package_dir: relative_package_dir.clone(),
}
@ -156,21 +161,21 @@ impl Nixpkgs {
pass(())
};
let check_result = flatten_check_results(
flatten_check_results(
[
name_check_result,
shard_check_result,
package_nix_check_result,
],
|_| (),
);
|_| package_name.clone(),
)
}
});
package_names.push(package_name.clone());
let check_result = flatten_check_results(check_results, |x| x);
check_result
};
write_check_result(error_writer, check_result)?;
if let Some(shard_package_names) = write_check_result(error_writer, check_result)? {
package_names.extend(shard_package_names)
}
}