From 07de7d6f0e6d17b1b28eac09df9bc10586fa46fa Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sun, 8 Jul 2012 09:03:05 -0400 Subject: [PATCH] Fix test that became flaky under Python v3.3. --- core/tests/scanner_test.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/tests/scanner_test.py b/core/tests/scanner_test.py index 1fecba65..af577d8d 100644 --- a/core/tests/scanner_test.py +++ b/core/tests/scanner_test.py @@ -446,7 +446,7 @@ def test_tie_breaker_same_name_plus_digit(fake_fileexists): assert group.ref is o5 def test_partial_group_match(fake_fileexists): - # Count the number od discarded matches (when a file doesn't match all other dupes of the + # Count the number of discarded matches (when a file doesn't match all other dupes of the # group) in Scanner.discarded_file_count s = Scanner() o1, o2, o3 = no('a b'), no('a'), no('b') @@ -454,8 +454,12 @@ def test_partial_group_match(fake_fileexists): [group] = s.get_dupe_groups([o1, o2, o3]) eq_(len(group), 2) assert o1 in group - assert o2 in group - assert o3 not in group + # The file that will actually be counted as a dupe is undefined. The only thing we want to test + # is that we don't have both + if o2 in group: + assert o3 not in group + else: + assert o3 in group eq_(s.discarded_file_count, 1) def test_dont_group_files_that_dont_exist(tmpdir):