diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py index e05c141511dd72563546d36a8fb666ff7086fabc_dGVzdHMvdGVzdC1zaW1wbGVtZXJnZS5weQ==..d75142ef054a160dd4f7cc1c557e7c5343299c0d_dGVzdHMvdGVzdC1zaW1wbGVtZXJnZS5weQ== 100644 --- a/tests/test-simplemerge.py +++ b/tests/test-simplemerge.py @@ -355,11 +355,5 @@ b'>>>>>>> THIS\r'.splitlines(True), list(m_lines)) if __name__ == '__main__': - # hide the timer - import time - orig = time.time - try: - time.time = lambda: 0 - unittest.main() - finally: - time.time = orig + import silenttestrunner + silenttestrunner.main(__name__) diff --git a/tests/test-simplemerge.py.out b/tests/test-simplemerge.py.out deleted file mode 100644 index e05c141511dd72563546d36a8fb666ff7086fabc_dGVzdHMvdGVzdC1zaW1wbGVtZXJnZS5weS5vdXQ=..0000000000000000000000000000000000000000 --- a/tests/test-simplemerge.py.out +++ /dev/null @@ -1,5 +0,0 @@ -................ ----------------------------------------------------------------------- -Ran 16 tests in 0.000s - -OK