blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ignore log tests due to concurrency conflicts (#9719)

This commit is contained in:
Jack May 2020-04-25 22:38:59 -07:00 committed by GitHub
parent c9d6c39c31
commit d3e3f51330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -3758,8 +3758,6 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serial_test 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serial_test_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 1.2.0", "solana-logger 1.2.0",
"solana-sdk 1.2.0", "solana-sdk 1.2.0",
"solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "solana_rbpf 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",

4
programs/bpf_loader/Cargo.toml
View File

@ -20,10 +20,6 @@ solana-sdk = { path = "../../sdk", version = "1.2.0" }
solana_rbpf = "=0.1.25" solana_rbpf = "=0.1.25"
thiserror = "1.0" thiserror = "1.0"
[dev-dependencies]
serial_test = "0.4.0"
serial_test_derive = "0.4.0"
[lib] [lib]
crate-type = ["lib", "cdylib"] crate-type = ["lib", "cdylib"]
name = "solana_bpf_loader_program" name = "solana_bpf_loader_program"

9
programs/bpf_loader/src/helpers.rs
View File

@ -258,7 +258,6 @@ impl HelperObject<BPFError> for HelperSolAllocFree {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use serial_test_derive::serial;
use solana_sdk::{ use solana_sdk::{
instruction::{AccountMeta, Instruction}, instruction::{AccountMeta, Instruction},
pubkey::Pubkey, pubkey::Pubkey,
@ -404,10 +403,10 @@ mod tests {
.unwrap(); .unwrap();
} }
// Serialize this test: solana_logger conflicts when running tests concurrently, // Ignore this test: solana_logger conflicts when running tests concurrently,
// this results in the bad string length being ignored and not returning an error // this results in the bad string length being ignored and not returning an error
#[test] #[test]
#[serial] #[ignore]
fn test_helper_sol_log() { fn test_helper_sol_log() {
let string = "Gaggablaghblagh!"; let string = "Gaggablaghblagh!";
let addr = string.as_ptr() as *const _ as u64; let addr = string.as_ptr() as *const _ as u64;
@ -432,10 +431,10 @@ mod tests {
.unwrap_err(); .unwrap_err();
} }
// Serialize this test: solana_logger conflicts when running tests concurrently, // Ignore this test: solana_logger conflicts when running tests concurrently,
// this results in the bad string length being ignored and not returning an error // this results in the bad string length being ignored and not returning an error
#[test] #[test]
#[serial] #[ignore]
fn test_helper_sol_log_u64() { fn test_helper_sol_log_u64() {
solana_logger::setup_with_default("solana=info"); solana_logger::setup_with_default("solana=info");