matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge branch 'fixes'

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2018-11-01 13:59:57 +01:00
commit ea7c239e1f
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bin/core/imag-link/src/main.rs
View file

@ -397,7 +397,7 @@ mod tests {
#[test]
fn test_link_modificates() {
setup_logging();
let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
let rt = generate_test_runtime(vec!["test1", "test2"])
.unwrap();
debug!("Runtime created");
@ -421,12 +421,14 @@ mod tests {
assert_ne!(*test_links1, links_toml_value(vec![]));
assert_ne!(*test_links2, links_toml_value(vec![]));
debug!("Test finished")
}
#[test]
fn test_linking_links() {
setup_logging();
let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
let rt = generate_test_runtime(vec!["test1", "test2"])
.unwrap();
debug!("Runtime created");
@ -455,7 +457,7 @@ mod tests {
#[test]
fn test_multilinking() {
setup_logging();
let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
let rt = generate_test_runtime(vec!["test1", "test2"])
.unwrap();
debug!("Runtime created");
@ -485,7 +487,7 @@ mod tests {
#[test]
fn test_linking_more_than_two() {
setup_logging();
let rt = generate_test_runtime(vec!["internal", "test1", "test2", "test3"])
let rt = generate_test_runtime(vec!["test1", "test2", "test3"])
.unwrap();
debug!("Runtime created");
@ -522,7 +524,7 @@ mod tests {
#[test]
fn test_linking_links_unlinking_removes_links() {
setup_logging();
let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
let rt = generate_test_runtime(vec!["test1", "test2"])
.unwrap();
debug!("Runtime created");
@ -558,7 +560,7 @@ mod tests {
#[test]
fn test_linking_and_unlinking_more_than_two() {
setup_logging();
let rt = generate_test_runtime(vec!["internal", "test1", "test2", "test3"])
let rt = generate_test_runtime(vec!["test1", "test2", "test3"])
.unwrap();
debug!("Runtime created");

8
lib/etc/libimagutil/src/testing.rs
View file

@ -96,9 +96,9 @@ macro_rules! make_mock_app {
#[allow(unused)]
pub fn generate_test_runtime<'a>(mut args: Vec<&'static str>) -> Result<Runtime<'a>, Error> {
let mut cli_args = vec![$appname, "--rtp", "/tmp"];
let mut cli_args = vec![$appname];
cli_args.append(&mut args);
debug!("Generating test runtime with args = {:?}", cli_args);
let cli_app = MockLinkApp::new(cli_args);
Runtime::with_configuration(cli_app, generate_minimal_test_config())
@ -108,9 +108,9 @@ macro_rules! make_mock_app {
pub fn reset_test_runtime<'a>(mut args: Vec<&'static str>, old_runtime: Runtime)
-> Result<Runtime<'a>, Error>
{
let mut cli_args = vec![$appname, "--rtp", "/tmp"];
let mut cli_args = vec![$appname];
cli_args.append(&mut args);
debug!("New arguments: {:?}", cli_args);
let cli_app = MockLinkApp::new(cli_args);
Runtime::with_configuration(cli_app, generate_minimal_test_config())