Show More
@@ -22,6 +22,7 b' test-backout.t' | |||||
22 | test-backwards-remove.t |
|
22 | test-backwards-remove.t | |
23 | test-bad-pull.t |
|
23 | test-bad-pull.t | |
24 | test-basic.t |
|
24 | test-basic.t | |
|
25 | test-bdiff.py | |||
25 | test-bheads.t |
|
26 | test-bheads.t | |
26 | test-bisect.t |
|
27 | test-bisect.t | |
27 | test-bisect2.t |
|
28 | test-bisect2.t |
@@ -99,9 +99,9 b' class BdiffTests(unittest.TestCase):' | |||||
99 | diffreplace(12, 12, b'', b'b\nc\n.\n'), |
|
99 | diffreplace(12, 12, b'', b'b\nc\n.\n'), | |
100 | b'd\ne\n', |
|
100 | b'd\ne\n', | |
101 | diffreplace(16, 18, b'.\n', b''), b'f\n'] |
|
101 | diffreplace(16, 18, b'.\n', b''), b'f\n'] | |
102 |
self.assert |
|
102 | self.assertTrue(got in (want_c, want_pure), | |
103 | 'got: %r, wanted either %r or %r' % ( |
|
103 | 'got: %r, wanted either %r or %r' % ( | |
104 | got, want_c, want_pure)) |
|
104 | got, want_c, want_pure)) | |
105 |
|
105 | |||
106 | def test_fixws(self): |
|
106 | def test_fixws(self): | |
107 | cases = [ |
|
107 | cases = [ |
General Comments 0
You need to be logged in to leave comments.
Login now