Merge pull request #211 from stepchowfun/flaky-tests

Fix a couple of flaky tests
stepchowfun · Feb 21, 2024 · a80b2c7 · a80b2c7
2 parents c27923a + 4669223
commit a80b2c7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/duplicates.rs b/src/duplicates.rs
@@ -114,10 +114,17 @@ mod tests {
 
         let errors = check(&tags_map);
         assert_eq!(errors.len(), 2);
-        assert!(errors[0].contains(&format!("{}", tags_vec2[0])));
-        assert!(errors[0].contains(&format!("{}", tags_vec2[1])));
-        assert!(errors[1].contains(&format!("{}", tags_vec3[0])));
-        assert!(errors[1].contains(&format!("{}", tags_vec3[1])));
-        assert!(errors[1].contains(&format!("{}", tags_vec3[2])));
+        assert!(
+            (errors[0].contains(&format!("{}", tags_vec2[0]))
+                && errors[0].contains(&format!("{}", tags_vec2[1]))
+                && errors[1].contains(&format!("{}", tags_vec3[0]))
+                && errors[1].contains(&format!("{}", tags_vec3[1]))
+                && errors[1].contains(&format!("{}", tags_vec3[2])))
+                || (errors[0].contains(&format!("{}", tags_vec3[0]))
+                    && errors[0].contains(&format!("{}", tags_vec3[1]))
+                    && errors[0].contains(&format!("{}", tags_vec3[2]))
+                    && errors[1].contains(&format!("{}", tags_vec2[0]))
+                    && errors[1].contains(&format!("{}", tags_vec2[1]))),
+        );
     }
 }
diff --git a/src/tag_references.rs b/src/tag_references.rs
@@ -75,7 +75,9 @@ mod tests {
 
         let errors = check(&tags, &refs);
         assert_eq!(errors.len(), 2);
-        assert!(errors[0].contains(&refs[1].label));
-        assert!(errors[1].contains(&refs[2].label));
+        assert!(
+            (errors[0].contains(&refs[1].label) && errors[1].contains(&refs[2].label))
+                || (errors[0].contains(&refs[2].label) && errors[1].contains(&refs[1].label)),
+        );
     }
 }