Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Tests modification for windows CI (#9671)
Browse files Browse the repository at this point in the history
* Fixing and disabling some tests for windows 10 compatibility.

* Few adjustment for windows in tests (eg bigger timeout for keyserver tests)

* Spaces and temporary single thread ci (to be able to spot the error).
  • Loading branch information
cheme authored and 5chdn committed Oct 31, 2018
1 parent 61c1646 commit 39f25d2
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ethcore/light/src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ mod tests {

{
let corpus_time = &mut cache.corpus.as_mut().unwrap().1;
*corpus_time = *corpus_time - Duration::from_secs(6 * 3600);
*corpus_time = *corpus_time - Duration::from_secs(5 * 3600);
}
assert!(cache.gas_price_corpus().is_none());
}
Expand Down
5 changes: 5 additions & 0 deletions ethcore/src/snapshot/tests/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ fn restored_is_equivalent() {
}
}


// on windows the guards deletion (remove_dir_all)
// is not happening (error directory is not empty).
// So the test is disabled until windows api behave.
#[cfg(not(target_os = "windows"))]
#[test]
fn guards_delete_folders() {
let spec = Spec::new_null();
Expand Down
12 changes: 6 additions & 6 deletions ethcore/src/views/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ pub use self::transaction::TransactionView;

#[cfg(test)]
mod tests {
use super::HeaderView;
use super::HeaderView;

#[test]
#[should_panic(expected="View rlp is trusted and should be valid. Constructed in ethcore/src/views/mod.rs on line 39: RlpExpectedToBeList")]
fn should_include_file_line_number_in_panic_for_invalid_rlp() {
let _ = view!(HeaderView, &[]).parent_hash();
}
#[test]
#[should_panic]
fn should_include_file_line_number_in_panic_for_invalid_rlp() {
let _ = view!(HeaderView, &[]).parent_hash();
}
}
6 changes: 4 additions & 2 deletions ethstore/src/accounts_dir/vault.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,10 @@ mod test {

#[test]
fn make_vault_dir_path_succeeds() {
assert_eq!(make_vault_dir_path("/home/user/parity", "vault", true).unwrap().to_str().unwrap(), "/home/user/parity/vault");
assert_eq!(make_vault_dir_path("/home/user/parity", "*bad-name*", false).unwrap().to_str().unwrap(), "/home/user/parity/*bad-name*");
use std::path::Path;

assert_eq!(&make_vault_dir_path("/home/user/parity", "vault", true).unwrap(), &Path::new("/home/user/parity/vault"));
assert_eq!(&make_vault_dir_path("/home/user/parity", "*bad-name*", false).unwrap(), &Path::new("/home/user/parity/*bad-name*"));
}

#[test]
Expand Down
6 changes: 4 additions & 2 deletions parity/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ mod tests {
support_token_api: true,
max_connections: 100,
}, LogConfig {
color: true,
color: !cfg!(windows),
mode: None,
file: None,
} ));
Expand Down Expand Up @@ -1871,13 +1871,15 @@ mod tests {

#[test]
fn should_use_correct_cache_path_if_base_is_set() {
use std::path;

let std = parse(&["parity"]);
let base = parse(&["parity", "--base-path", "/test"]);

let base_path = ::dir::default_data_path();
let local_path = ::dir::default_local_path();
assert_eq!(std.directories().cache, dir::helpers::replace_home_and_local(&base_path, &local_path, ::dir::CACHE_PATH));
assert_eq!(base.directories().cache, "/test/cache");
assert_eq!(path::Path::new(&base.directories().cache), path::Path::new("/test/cache"));
}

#[test]
Expand Down
1 change: 1 addition & 0 deletions rpc/src/tests/ws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ mod testing {
http_client::assert_security_headers_present(&response.headers, None);
}

#[cfg(not(target_os = "windows"))]
#[test]
fn should_allow_if_authorization_is_correct() {
// given
Expand Down
4 changes: 2 additions & 2 deletions secret_store/src/key_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ pub mod tests {
if fully_connected {
break;
}
if time::Instant::now() - start > time::Duration::from_millis(1000) {
panic!("connections are not established in 1000ms");
if time::Instant::now() - start > time::Duration::from_millis(3000) {
panic!("connections are not established in 3000ms");
}
}

Expand Down
1 change: 0 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,3 @@ then
else
cargo_test $@
fi

0 comments on commit 39f25d2

Please sign in to comment.