Don't panic in Offchain test context, when we are already panicking (#…

…3996)
paritytech · Nov 1, 2019 · cf90ba6 · cf90ba6
1 parent a2191ee
commit cf90ba6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/offchain/src/testing.rs b/core/offchain/src/testing.rs
@@ -119,7 +119,8 @@ impl State {
 
 impl Drop for State {
 	fn drop(&mut self) {
-		if !self.expected_requests.is_empty() {
+		// If we panic! while we are already in a panic, the test dies with an illegal instruction.
+		if !self.expected_requests.is_empty() && !std::thread::panicking() {
 			panic!("Unfulfilled expected requests: {:?}", self.expected_requests);
 		}
 	}