Clean up
This commit is contained in:
parent
3f60b72c3b
commit
b414c05400
18 changed files with 905 additions and 985 deletions
|
|
@ -9,153 +9,125 @@ use tempfile::{NamedTempFile, TempDir};
|
|||
|
||||
#[test]
|
||||
fn test_scheduler_invalid_cron_expressions() {
|
||||
// Test that scheduler now properly rejects invalid cron expressions instead of falling back
|
||||
let invalid_cron_configs = [
|
||||
let invalid_crons = [
|
||||
"invalid cron",
|
||||
"0 0 25 * * *", // Invalid hour
|
||||
"60 0 2 * * *", // Invalid minute
|
||||
"", // Empty string
|
||||
"0 0 2 * *", // Missing field
|
||||
"0 0 25 * * *",
|
||||
"60 0 2 * * *",
|
||||
"",
|
||||
"0 0 2 * *",
|
||||
];
|
||||
|
||||
for invalid_cron in invalid_cron_configs {
|
||||
for cron in invalid_crons {
|
||||
let config = Config {
|
||||
compose_paths: vec![PathBuf::from("./test")],
|
||||
schedule: invalid_cron.to_string(),
|
||||
schedule: cron.to_string(),
|
||||
registries: HashMap::new(),
|
||||
update_strategy: UpdateStrategy::Latest,
|
||||
ignore_images: vec![],
|
||||
dry_run: true,
|
||||
};
|
||||
|
||||
let result = Scheduler::new(config, None);
|
||||
assert!(
|
||||
result.is_err(),
|
||||
"Expected error for invalid cron expression: '{invalid_cron}'"
|
||||
Scheduler::new(config, None).is_err(),
|
||||
"Expected error for invalid cron expression: '{cron}'"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_scheduler_valid_cron_expressions() {
|
||||
// Test that scheduler accepts valid cron expressions
|
||||
let valid_cron_configs = [
|
||||
"0 0 2 * * *", // Default - 2 AM daily
|
||||
"0 30 1 * * *", // 1:30 AM daily
|
||||
"0 0 */6 * * *", // Every 6 hours
|
||||
"0 0 2 * * MON", // Mondays at 2 AM
|
||||
"0 15 14 1 * *", // 1st of month at 2:15 PM
|
||||
let valid_crons = [
|
||||
"0 0 2 * * *",
|
||||
"0 30 1 * * *",
|
||||
"0 0 */6 * * *",
|
||||
"0 0 2 * * MON",
|
||||
"0 15 14 1 * *",
|
||||
];
|
||||
|
||||
for valid_cron in valid_cron_configs {
|
||||
for cron in valid_crons {
|
||||
let config = Config {
|
||||
compose_paths: vec![PathBuf::from("./test")],
|
||||
schedule: valid_cron.to_string(),
|
||||
schedule: cron.to_string(),
|
||||
registries: HashMap::new(),
|
||||
update_strategy: UpdateStrategy::Latest,
|
||||
ignore_images: vec![],
|
||||
dry_run: true,
|
||||
};
|
||||
|
||||
let result = Scheduler::new(config, None);
|
||||
assert!(
|
||||
result.is_ok(),
|
||||
"Expected success for valid cron expression: '{valid_cron}'"
|
||||
Scheduler::new(config, None).is_ok(),
|
||||
"Expected success for valid cron expression: '{cron}'"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_compose_invalid_file_paths() {
|
||||
let config = create_test_config();
|
||||
let updater = ComposeUpdater::new(config);
|
||||
let updater = ComposeUpdater::new(create_test_config());
|
||||
|
||||
// Test with completely invalid path
|
||||
let result = updater.parse_compose_file("/nonexistent/path/file.yml");
|
||||
assert!(result.is_err(), "Should fail for nonexistent file");
|
||||
assert!(updater
|
||||
.parse_compose_file("/nonexistent/path/file.yml")
|
||||
.is_err());
|
||||
|
||||
// Test with directory instead of file
|
||||
let temp_dir = TempDir::new().unwrap();
|
||||
let result = updater.parse_compose_file(temp_dir.path().to_str().unwrap());
|
||||
assert!(result.is_err(), "Should fail when path is a directory");
|
||||
assert!(updater
|
||||
.parse_compose_file(temp_dir.path().to_str().unwrap())
|
||||
.is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_compose_malformed_yaml() {
|
||||
let config = create_test_config();
|
||||
let updater = ComposeUpdater::new(config);
|
||||
let updater = ComposeUpdater::new(create_test_config());
|
||||
|
||||
let malformed_yamls = [
|
||||
// Invalid YAML syntax
|
||||
r#"
|
||||
version: '3.8'
|
||||
services:
|
||||
web:
|
||||
image: nginx:1.21.0
|
||||
invalid_indent
|
||||
ports:
|
||||
- "80:80"
|
||||
"#,
|
||||
// Missing required fields
|
||||
r#"
|
||||
version: '3.8'
|
||||
# Missing services section
|
||||
"#,
|
||||
// Completely empty file
|
||||
"",
|
||||
// Invalid version format
|
||||
r#"
|
||||
version: invalid
|
||||
services:
|
||||
web:
|
||||
image: nginx:1.21.0
|
||||
"#,
|
||||
];
|
||||
// Missing services section -> no services found
|
||||
let mut temp_file = NamedTempFile::new().unwrap();
|
||||
temp_file.write_all(b"version: '3.8'\n").unwrap();
|
||||
let result = updater
|
||||
.parse_compose_file(temp_file.path().to_str().unwrap())
|
||||
.unwrap();
|
||||
assert!(result.services.is_empty());
|
||||
|
||||
for (i, malformed_yaml) in malformed_yamls.iter().enumerate() {
|
||||
let mut temp_file = NamedTempFile::new().unwrap();
|
||||
temp_file.write_all(malformed_yaml.as_bytes()).unwrap();
|
||||
// Empty file -> no services found
|
||||
let mut temp_file = NamedTempFile::new().unwrap();
|
||||
temp_file.write_all(b"").unwrap();
|
||||
let result = updater
|
||||
.parse_compose_file(temp_file.path().to_str().unwrap())
|
||||
.unwrap();
|
||||
assert!(result.services.is_empty());
|
||||
|
||||
let result = updater.parse_compose_file(temp_file.path().to_str().unwrap());
|
||||
|
||||
// We expect these to either fail or return empty services (graceful degradation)
|
||||
if result.is_ok() {
|
||||
let compose_file = result.unwrap();
|
||||
// If it parses successfully, it should at least not crash
|
||||
assert!(
|
||||
compose_file.services.is_empty() || !compose_file.services.is_empty(),
|
||||
"Test case {i} should either fail or succeed gracefully"
|
||||
);
|
||||
}
|
||||
// If it fails, that's also acceptable behavior for malformed YAML
|
||||
}
|
||||
// Valid services section with invalid version field -> still finds services
|
||||
let mut temp_file = NamedTempFile::new().unwrap();
|
||||
temp_file
|
||||
.write_all(b"version: invalid\nservices:\n web:\n image: nginx:1.21.0\n")
|
||||
.unwrap();
|
||||
let result = updater
|
||||
.parse_compose_file(temp_file.path().to_str().unwrap())
|
||||
.unwrap();
|
||||
assert_eq!(result.services.len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_image_ref_parsing_edge_cases() {
|
||||
// Test that image parsing doesn't crash on edge cases
|
||||
let long_name = "a".repeat(300);
|
||||
let edge_case_refs = [
|
||||
"", // Empty string
|
||||
":", // Just colon
|
||||
"image:", // Missing tag
|
||||
":tag", // Missing image
|
||||
"registry.com/", // Missing image name
|
||||
&long_name, // Extremely long name
|
||||
];
|
||||
// Empty string parses but produces empty name (no panic)
|
||||
let result = ImageRef::parse("").unwrap();
|
||||
assert_eq!(result.name, "");
|
||||
assert_eq!(result.tag, "latest");
|
||||
|
||||
for edge_case_ref in edge_case_refs {
|
||||
let result = ImageRef::parse(edge_case_ref);
|
||||
// The main goal is that parsing doesn't crash and returns a result
|
||||
// Some might succeed (with defaults) or fail - both are acceptable
|
||||
if result.is_ok() {
|
||||
let _image_ref = result.unwrap();
|
||||
// If it succeeds, that's fine - the parser is robust
|
||||
// We don't make strict assertions about the content since
|
||||
// the parser may use defaults for edge cases
|
||||
}
|
||||
// If they fail, that's also perfectly acceptable behavior
|
||||
}
|
||||
// Missing tag defaults to "latest"
|
||||
let result = ImageRef::parse("nginx").unwrap();
|
||||
assert_eq!(result.tag, "latest");
|
||||
assert_eq!(result.name, "nginx");
|
||||
|
||||
// Registry with namespace
|
||||
let result = ImageRef::parse("ghcr.io/user/app:v1").unwrap();
|
||||
assert_eq!(result.registry, "ghcr.io");
|
||||
assert_eq!(result.namespace, Some("user".to_string()));
|
||||
assert_eq!(result.name, "app");
|
||||
assert_eq!(result.tag, "v1");
|
||||
|
||||
// Very long name shouldn't panic
|
||||
let long_name = "a".repeat(300);
|
||||
let _ = ImageRef::parse(&long_name);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -163,7 +135,7 @@ fn test_registry_unknown_registry() {
|
|||
let config = Config {
|
||||
compose_paths: vec![],
|
||||
schedule: "0 0 2 * * *".to_string(),
|
||||
registries: HashMap::new(), // Empty registries
|
||||
registries: HashMap::new(),
|
||||
update_strategy: UpdateStrategy::Latest,
|
||||
ignore_images: vec![],
|
||||
dry_run: true,
|
||||
|
|
@ -171,7 +143,6 @@ fn test_registry_unknown_registry() {
|
|||
|
||||
let registry_client = RegistryClient::new(config);
|
||||
|
||||
// Test with an unknown registry
|
||||
let image_ref = ImageRef {
|
||||
registry: "unknown.registry.com".to_string(),
|
||||
namespace: Some("user".to_string()),
|
||||
|
|
@ -179,57 +150,43 @@ fn test_registry_unknown_registry() {
|
|||
tag: "1.0.0".to_string(),
|
||||
};
|
||||
|
||||
// This should fail because the registry is not configured
|
||||
let rt = tokio::runtime::Runtime::new().unwrap();
|
||||
let result = rt.block_on(registry_client.get_available_versions(&image_ref));
|
||||
assert!(result.is_err(), "Should fail for unknown registry");
|
||||
assert!(result.is_err());
|
||||
|
||||
let error_msg = result.unwrap_err().to_string();
|
||||
assert!(
|
||||
error_msg.contains("Unknown registry"),
|
||||
"Error should mention unknown registry, got: {error_msg}"
|
||||
"Expected 'Unknown registry' in error, got: {error_msg}"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_compose_update_with_empty_paths() {
|
||||
let config = Config {
|
||||
compose_paths: vec![], // Empty paths
|
||||
compose_paths: vec![],
|
||||
..create_test_config()
|
||||
};
|
||||
let updater = ComposeUpdater::new(config);
|
||||
|
||||
// Should handle empty paths gracefully
|
||||
let result = updater.update_all_compose_files().await;
|
||||
assert!(result.is_ok(), "Should handle empty paths gracefully");
|
||||
assert!(
|
||||
result.unwrap().is_empty(),
|
||||
"Should return empty list for empty paths"
|
||||
);
|
||||
let result = updater.update_all_compose_files().await.unwrap();
|
||||
assert_eq!(result.files_found, 0);
|
||||
assert!(result.updated_files.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_config_edge_cases() {
|
||||
// Test config with minimal valid data
|
||||
let minimal_config = Config {
|
||||
compose_paths: vec![], // Empty paths
|
||||
compose_paths: vec![],
|
||||
schedule: "0 0 2 * * *".to_string(),
|
||||
registries: HashMap::new(), // No registries
|
||||
registries: HashMap::new(),
|
||||
update_strategy: UpdateStrategy::Latest,
|
||||
ignore_images: vec![],
|
||||
dry_run: true,
|
||||
};
|
||||
|
||||
// Should be able to create scheduler with minimal config
|
||||
let scheduler_result = Scheduler::new(minimal_config.clone(), None);
|
||||
assert!(
|
||||
scheduler_result.is_ok(),
|
||||
"Should accept minimal valid config"
|
||||
);
|
||||
|
||||
// Should be able to create compose updater with minimal config
|
||||
assert!(Scheduler::new(minimal_config.clone(), None).is_ok());
|
||||
let _updater = ComposeUpdater::new(minimal_config.clone());
|
||||
// This should not panic
|
||||
assert!(!minimal_config.is_image_ignored("any-image:tag"));
|
||||
}
|
||||
|
||||
|
|
@ -238,8 +195,7 @@ fn test_version_selection_with_mismatched_prefixes_suffixes() {
|
|||
use docker_compose_updater::strategy::create_selector;
|
||||
use docker_compose_updater::version::VersionInfo;
|
||||
|
||||
let config = create_test_config();
|
||||
let selector = create_selector(&config.update_strategy);
|
||||
let selector = create_selector(&create_test_config().update_strategy);
|
||||
|
||||
let current_prefix = Some("v".to_string());
|
||||
let current_suffix = Some("-alpine".to_string());
|
||||
|
|
@ -251,10 +207,9 @@ fn test_version_selection_with_mismatched_prefixes_suffixes() {
|
|||
];
|
||||
|
||||
let target = selector.select_target_version(&available, current_prefix, current_suffix);
|
||||
|
||||
assert!(
|
||||
target.is_none(),
|
||||
"Should not find target when prefix/suffix don't match"
|
||||
"No versions match both prefix 'v' and suffix '-alpine'"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue