This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6921

tests: use silenttestrunner in test-simplemerge.py
ClosedPublic

Authored by indygreg on Sep 29 2019, 3:35 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd75142ef054a: tests: use silenttestrunner in test-simplemerge.py
Summary

The time monkeypatching doesn't appear to work reliably in
Python 3, possibly due to unittest using a different time
function. This makes the test intermittent due to the
execution time not always being 0.00s.

We have our own wrapper around unittest for more deterministic
test output. So let's use it.

As a bonus, all test output disappeared, so we can remove the
.out file!

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 29 2019, 3:35 PM
pulkit accepted this revision.Sep 30 2019, 8:17 AM
This revision is now accepted and ready to land.Sep 30 2019, 8:17 AM
indygreg added a commit: rHGd75142ef054a: tests: use silenttestrunner in test-simplemerge.py.Sep 30 2019, 8:49 AM
Closed by commit rHGd75142ef054a: tests: use silenttestrunner in test-simplemerge.py (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-simplemerge.py (10 lines)
DMtests/test-simplemerge.py.out (5 lines)

Diff 16703

tests/test-simplemerge.py

other_text = b'c\r' other_text = b'c\r'
m3 = Merge3(base_text.splitlines(True), other_text.splitlines(True), m3 = Merge3(base_text.splitlines(True), other_text.splitlines(True),
this_text.splitlines(True)) this_text.splitlines(True))
m_lines = m3.merge_lines(b'OTHER', b'THIS') m_lines = m3.merge_lines(b'OTHER', b'THIS')
self.assertEqual(b'<<<<<<< OTHER\rc\r=======\rb\r' self.assertEqual(b'<<<<<<< OTHER\rc\r=======\rb\r'
b'>>>>>>> THIS\r'.splitlines(True), list(m_lines)) b'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
if __name__ == '__main__': if __name__ == '__main__':
# hide the timer import silenttestrunner
import time silenttestrunner.main(__name__)
orig = time.time
try:
time.time = lambda: 0
unittest.main()
finally:
time.time = orig

tests/test-simplemerge.py.out

  • This file was deleted.
................
----------------------------------------------------------------------
Ran 16 tests in 0.000s
OK