Merge pull request #348 from google:fix_flake

PiperOrigin-RevId: 598544256

Author: copybara-github

googletest/.cargo/config.toml renamed to .cargo/config.toml

@@ -68,6 +68,7 @@ mod tests {
     use super::displays_as;
     use crate::prelude::*;
     use indoc::indoc;
+    use serial_test::parallel;
     use std::fmt::{Debug, Display, Error, Formatter};
 
     #[test]
@@ -102,6 +103,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn display_displays_error_message_with_explanation_from_inner_matcher() -> Result<()> {
         let result = verify_that!("123\n234", displays_as(eq("123\n345")));
 

googletest/src/matchers/display_matcher.rs

@@ -103,6 +103,7 @@ mod tests {
     use super::eq_deref_of;
     use crate::prelude::*;
     use indoc::indoc;
+    use serial_test::parallel;
 
     #[derive(Debug, PartialEq)]
     struct NonCloneNonCopyStruct(i32);
@@ -123,6 +124,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn shows_structured_diff() -> Result<()> {
         #[derive(Debug, PartialEq)]
         struct Strukt {

googletest/src/matchers/eq_deref_of_matcher.rs

@@ -138,6 +138,7 @@ mod tests {
     use super::eq;
     use crate::prelude::*;
     use indoc::indoc;
+    use serial_test::parallel;
 
     #[test]
     fn eq_matches_string_reference_with_string_reference() -> Result<()> {
@@ -162,6 +163,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn eq_struct_debug_diff() -> Result<()> {
         #[derive(Debug, PartialEq)]
         struct Strukt {
@@ -191,6 +193,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn eq_vec_debug_diff() -> Result<()> {
         let result = verify_that!(vec![1, 2, 3], eq(vec![1, 3, 4]));
         verify_that!(
@@ -213,6 +216,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn eq_vec_debug_diff_length_mismatch() -> Result<()> {
         let result = verify_that!(vec![1, 2, 3, 4, 5], eq(vec![1, 3, 5]));
         verify_that!(
@@ -236,6 +240,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn eq_debug_diff_common_lines_omitted() -> Result<()> {
         let result = verify_that!((1..50).collect::<Vec<_>>(), eq((3..52).collect::<Vec<_>>()));
         verify_that!(
@@ -260,6 +265,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn eq_debug_diff_5_common_lines_not_omitted() -> Result<()> {
         let result = verify_that!((1..8).collect::<Vec<_>>(), eq((3..10).collect::<Vec<_>>()));
         verify_that!(
@@ -284,6 +290,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn eq_debug_diff_start_common_lines_omitted() -> Result<()> {
         let result = verify_that!((1..50).collect::<Vec<_>>(), eq((1..52).collect::<Vec<_>>()));
         verify_that!(
@@ -305,6 +312,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn eq_debug_diff_end_common_lines_omitted() -> Result<()> {
         let result = verify_that!((1..52).collect::<Vec<_>>(), eq((3..52).collect::<Vec<_>>()));
         verify_that!(
@@ -343,6 +351,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn match_explanation_contains_diff_of_strings_if_more_than_one_line() -> Result<()> {
         let result = verify_that!(
             indoc!(

googletest/src/matchers/eq_matcher.rs

@@ -593,6 +593,7 @@ mod tests {
     use crate::matcher::{Matcher, MatcherResult};
     use crate::prelude::*;
     use indoc::indoc;
+    use serial_test::parallel;
 
     #[test]
     fn matches_string_reference_with_equal_string_reference() -> Result<()> {
@@ -986,6 +987,7 @@ mod tests {
     }
 
     #[test]
+    #[parallel]
     fn match_explanation_for_starts_with_ignores_trailing_lines_in_actual_string() -> Result<()> {
         let result = verify_that!(
             indoc!(