##// END OF EJS Templates
tests: use silenttestrunner in test-simplemerge.py...
Gregory Szorc -
r43280:d75142ef default
parent child Browse files
Show More
@@ -355,11 +355,5 b' bbb'
355 b'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
355 b'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
356
356
357 if __name__ == '__main__':
357 if __name__ == '__main__':
358 # hide the timer
358 import silenttestrunner
359 import time
359 silenttestrunner.main(__name__)
360 orig = time.time
361 try:
362 time.time = lambda: 0
363 unittest.main()
364 finally:
365 time.time = orig
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now