Skip to content

Commit

Permalink
Merge pull request #1313 from Barsik-sus/willbe_fix_unchanged_tests
Browse files Browse the repository at this point in the history 
READY: (willbe): Refresh the `ListNodeReport` for tests by adding the missing `duplicate` field
  • Loading branch information
@Wandalen
Wandalen committed May 6, 2024
2 parents 35f367e + 99be05b commit f4e72d7
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 10 deletions.
2 changes: 1 addition & 1 deletion module/move/willbe/src/action/publish.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ mod private
None
};

let subgraph = graph::remove_not_required_to_publish( &package_map, &tmp, &packages_to_publish, dir.clone() ).err_with( || report.clone() )?;
let subgraph = graph::remove_not_required_to_publish( &package_map, &tmp, &packages_to_publish, dir.clone() )?;
let subgraph = subgraph.map( | _, n | n, | _, e | e );

let queue = graph::toposort( subgraph ).unwrap().into_iter().map( | n | package_map.get( &n ).unwrap() ).cloned().collect::< Vec< _ > >();
Expand Down
12 changes: 6 additions & 6 deletions module/move/willbe/src/entity/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ mod private
/// actually executing them.
pub dry : bool,
/// Vector of succses reports.
pub succses_reports : Vec< TestReport >,
pub success_reports : Vec< TestReport >,
/// Vector of failure reports.
pub failure_reports : Vec< TestReport >,
}
Expand All @@ -638,15 +638,15 @@ mod private
// qqq : for Petro : bad. should be exact command with exact parameters / при виклику зовнішніх команд повинен бути вивід у консоль про цей виклик і його аргументи за виключенням коли ційлий блок виводу прихований (у моєму випадку при фейлі)
return Ok( () )
}
if self.succses_reports.is_empty() && self.failure_reports.is_empty()
if self.success_reports.is_empty() && self.failure_reports.is_empty()
{
writeln!( f, "The tests have not been run." )?;
return Ok( () );
}
if !self.succses_reports.is_empty()
if !self.success_reports.is_empty()
{
writeln!( f, "Successful :" )?;
for report in &self.succses_reports
for report in &self.success_reports
{
writeln!( f, "{}", report )?;
}
Expand All @@ -660,7 +660,7 @@ mod private
}
}
writeln!( f, "Global report" )?;
writeln!( f, " {}", generate_summary_message( self.failure_reports.len() as i32, self.succses_reports.len() as i32 ) )?;
writeln!( f, " {}", generate_summary_message( self.failure_reports.len() as i32, self.success_reports.len() as i32 ) )?;

Ok( () )
}
Expand Down Expand Up @@ -796,7 +796,7 @@ mod private
{
Ok( r ) =>
{
report.lock().unwrap().succses_reports.push( r );
report.lock().unwrap().success_reports.push( r );
}
Err(( r, _ )) =>
{
Expand Down
4 changes: 3 additions & 1 deletion module/move/willbe/tests/inc/action/list/data.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ mod workspace_with_cyclic_dependency

// (*) - means duplication
let ultra_sub_tree = &mega_sub_tree.normal_dependencies[ 0 ];
assert_eq!( "_workspace_with_cyclic_dep_b (*)", ultra_sub_tree.name.as_str() );
assert_eq!( "_workspace_with_cyclic_dep_b", ultra_sub_tree.name.as_str() );
assert_eq!( "*", sub_tree.version.as_ref().unwrap().as_str() );
assert!( ultra_sub_tree.duplicate );
assert_eq!( "*", ultra_sub_tree.version.as_ref().unwrap().as_str() );

assert!( ultra_sub_tree.normal_dependencies.is_empty() );
Expand Down
28 changes: 28 additions & 0 deletions module/move/willbe/tests/inc/action/list/format.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@ fn node_with_depth_two_leaves_stop_spacer()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec!
[
ListNodeReport
{
name : "sub_node1".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![ ListNodeReport
{
name : "sub_sub_node1".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand All @@ -34,11 +37,13 @@ fn node_with_depth_two_leaves_stop_spacer()
name : "sub_node2".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![ ListNodeReport
{
name : "sub_sub_node2".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -73,18 +78,21 @@ fn node_with_depth_two_leaves()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec!
[
ListNodeReport
{
name : "sub_node1".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![ ListNodeReport
{
name : "sub_sub_node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand All @@ -97,6 +105,7 @@ fn node_with_depth_two_leaves()
name : "sub_node2".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -127,16 +136,19 @@ fn node_with_depth_one_leaf()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![ ListNodeReport
{
name : "sub_node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![ ListNodeReport
{
name : "sub_sub_node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -168,6 +180,7 @@ fn node_with_build_dependencies_tree_with_two_leaves()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec!
Expand All @@ -177,6 +190,7 @@ fn node_with_build_dependencies_tree_with_two_leaves()
name : "build_sub_node1".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand All @@ -186,6 +200,7 @@ fn node_with_build_dependencies_tree_with_two_leaves()
name : "build_sub_node2".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -214,6 +229,7 @@ fn node_with_build_dependencies_tree_with_one_leaf()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![
Expand All @@ -222,6 +238,7 @@ fn node_with_build_dependencies_tree_with_one_leaf()
name : "build_sub_node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -249,6 +266,7 @@ fn node_with_dev_dependencies_tree_with_two_leaves()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec!
[
Expand All @@ -257,6 +275,7 @@ fn node_with_dev_dependencies_tree_with_two_leaves()
name : "dev_sub_node1".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand All @@ -266,6 +285,7 @@ fn node_with_dev_dependencies_tree_with_two_leaves()
name : "dev_sub_node2".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -295,13 +315,15 @@ fn node_with_dev_dependencies_tree_with_one_leaf()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![
ListNodeReport
{
name : "dev_sub_node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -330,13 +352,15 @@ fn node_with_dependencies_tree_with_two_leaves()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec!
[
ListNodeReport
{
name : "sub_node1".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand All @@ -346,6 +370,7 @@ fn node_with_dependencies_tree_with_two_leaves()
name : "sub_node2".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -375,11 +400,13 @@ fn node_with_dependency_tree_with_one_leaf()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![ ListNodeReport
{
name : "sub_node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down Expand Up @@ -407,6 +434,7 @@ fn one_node_one_line()
name : "node".into(),
version : None,
path : None,
duplicate : false,
normal_dependencies : vec![],
dev_dependencies : vec![],
build_dependencies : vec![],
Expand Down
4 changes: 2 additions & 2 deletions module/move/willbe/tests/inc/action/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ fn call_from_workspace_root()


assert_eq!( rep.failure_reports.len(), 1 );
assert_eq!( rep.succses_reports.len(), 2 );
assert_eq!( rep.success_reports.len(), 2 );
}

#[ test ]
Expand Down Expand Up @@ -174,7 +174,7 @@ fn plan()
.with_progress( false )
.form();

let rep = test( args, true ).unwrap().succses_reports[ 0 ].clone().tests;
let rep = test( args, true ).unwrap().success_reports[ 0 ].clone().tests;

assert!( rep.get( &TestVariant::former().optimization( Optimization::Debug ).channel( Channel::Stable ).features( BTreeSet::default() ).form() ).is_some() );
assert!( rep.get( &TestVariant::former().optimization( Optimization::Debug ).channel( Channel::Nightly ).features( BTreeSet::default() ).form() ).is_some() );
Expand Down

0 comments on commit f4e72d7

Please sign in to comment.